diff --git a/Changelog.yaml b/Changelog.yaml
index 4997cca255..2e12b8bfbc 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,142 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.7.4
+  date: 2010-06-19
+
+  bug fixes:
+    - title: "Fix regression in 0.7.3 that broke creating custom columns of rating or text types"
+      
+    - title: "Fix cover browser breaking if you click on a book in the book list while cover browser is animated"
+
+    - title: "Fix a bug that could be triggered with the new book details pane if a book has a zero size cover"
+      tickets: [5889]
+
+    - title: "SONY driver: Fix bug preventing the editing of collections in the device view"
+
+  new recipes:
+    - title: Auto Prove
+      author: Gabriele Marini
+      
+    - title: Forbes India, Maximum PC, Today Online
+      author: rty
+
+  improved recipes:
+    - WSJ
+    - Psychology Today
+        
+
+- version: 0.7.3
+  date: 2010-06-18
+
+  new features:
+    - title: "The Tag Browser now display an average rating for each item"
+      type: major
+      description: >
+        "
+        The icons of each individual item in the Tag Browser are now partially colored to indicate the average rating of
+        all books belonging to that category. For example, the icon next to each author is partially colored based on the
+        averagerating of all books by that author in your calibre library. You can also hover your mouse over the item to
+        see the average rating in a tooltip. Can be turned off via Preferences->Interface
+        "
+
+    - title: "Editable author sort for each author"
+      type: major
+      description: >
+        "calibre has always allowed you to specify the author sort for each bookin your collection. Now you
+        can also specify the way the name of each individual author should be sorted. This is used to display the list
+        of authors in the Tag Browser and OPDS feeds in the Content Server"
+
+    - title: "When downloading metadata, also get series information from librarything.com"
+      type: major
+      tickets: [5148]
+
+    - title: "Redesign of the Book Details pane"
+      type: major
+      description: >
+        "The Book details pane now display covers with animation. Also instead of showing the full path to the book, you now have
+        clickable links to open the containing folder or individual formats. The path information is still accessible via a tooltip"
+
+    - title: "New User Interface layouts"
+      type: major
+      description: >
+        "calibre now has two user interface layouts selectable from Preferences->Interface. The 'wide' layout has the book details pane on the side
+        and the 'narrow' layout has it on the bottom. The default layout is now wide."
+
+    - title: "You can now add books directly from the device to the calibre library by right clicking on the books in the device views"
+
+    - title: "iPad driver: Create category from series preferentially, also handle series sorting"
+
+    - title: "SONY driver: Add an option to use author_sort instead of author when sending to device"
+
+    - title: "Hitting Enter in the search box now causes the search to be re-run"
+      tickets: [5856]
+
+    - title: "Boox driver: Make destination directory for books customizable"
+
+    - title: "Add plugin to download metadata from douban.com. Disabled by default."
+
+    - title: "OS X/linux driver for PocketBook 301"
+
+    - title: "Support for the Samsung Galaxy and Sigmatek EBK52"
+
+    - title: "On startup do not focus the search bar. Instead you can acces the search bar easily by pressing the / key or the standard search keyboard shortcut for your operating system"
+
+  bug fixes:
+    - title: "iPad driver: Various bug fixes"
+
+    - title: "Kobo Output profile: Adjust the screen dimensions when converting comics"
+
+    - title: "Fix using Preferences when a device is connected causes items in device menu to be disabled"
+
+    - title: "CHM Input: Skip files whoose names are too long for windows"
+
+    - title: "Brighten up calibre icon on dark backgrounds"
+
+    - title: "Ignore 'Unknown' in title/autors when downloading metadata"
+      tickets: [5633]
+
+    - title: "Fix regression that broke various entries in the menus - Preferences, Open containing folder and Edit metadata individually"
+
+    - title: "EPUB metadata: Handle comma separated entries in <dc:subject> tags correctly"
+      tickets: [5855]
+
+    - title: "MOBI Output: Fix underlines not being rendered"
+      tickets: [5830]
+
+    - title: "EPUB Output: Remove workaround for old versions of Adobe Digital Editions' faulty rendering of links in html. calibre no longer forces links to be blue and underlined"
+
+    - title: "Fix a bug that could cause the show pane buttons to not show hidden panes"
+
+    - title: "Fix Tag Editor does not reflect recently changed data in Tag Catagory Text Box"
+      tickets: [5809]
+
+    - title: "Content server: Fix sorting of books by authors instead of author_sort in the main and mobile views"
+
+    - title: "Cover cache: Resize covers larger than 600x800 in the cover cache to reduce memory consumption in the GUI"
+
+    - title: "EPUB Output: Default cover is generated is now generated as a JPEG instead of PNG32, reducing size by an order of magnitude."
+      tickets: [5810]
+
+    - title: "Cover Browser: Scale text size with height of cover browser. Only show a reflection of half the cover. Also restore rendering quality after regression in 0.7.1"
+      tickets: [5808]
+
+    - title: "Book list: Do not let the default layout have any column wider than 350 pixels"
+
+  new recipes:
+    - title: Akter 
+      author: Darko Miletic
+
+    - title: Thai Rath and The Nation (Thailand)
+      author: Anat Ruangrassamee
+
+  improved recipes:
+    - Wall Street Journal 
+    - New York Times
+    - Slashdot
+    - Publico
+    - Danas
+
 - version: 0.7.2
   date: 2010-06-11
 
diff --git a/resources/recipes/auto_prove.recipe b/resources/recipes/auto_prove.recipe
new file mode 100644
index 0000000000..109f104206
--- /dev/null
+++ b/resources/recipes/auto_prove.recipe
@@ -0,0 +1,90 @@
+#!/usr/bin/env  python
+__license__     = 'GPL v3'
+__author__      = 'GabrieleMarini, based on Darko Miletic'
+__copyright__   = '2009, Darko Miletic <darko.miletic at gmail.com>, Gabriele Marini'
+__version__     = 'v1.02 Marini Gabriele '
+__date__        = '10, January 2010'
+__description__ = 'Italian daily newspaper'
+
+'''
+http://www.corrieredellosport.it/
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AutoPR(BasicNewsRecipe):
+    __author__     = 'Gabriele Marini'
+    description    = 'Auto and Formula 1'
+
+    cover_url      = 'http://www.auto.it/res/imgs/logo_Auto.png'
+
+
+    title          = u'Auto Prove'
+    publisher      = 'CONTE Editore'
+    category       = 'Sport'
+
+    language       = 'it'
+    timefmt        = '[%a, %d %b, %Y]'
+
+    oldest_article = 60
+    max_articles_per_feed = 20
+    use_embedded_content  = False
+    recursion             = 100
+
+    remove_javascript = True
+    no_stylesheets = True
+
+    #html2lrf_options = [
+    #                      '--comment', description
+    #                    , '--category', category
+    #                    , '--publisher', publisher
+    #                    , '--ignore-tables'
+    #                    ]
+
+    #html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True'
+
+    keep_only_tags = [
+                      dict(name='h2', attrs={'class':['tit_Article y_Txt']}),
+                      dict(name='h2', attrs={'class':['tit_Article']}),
+                      dict(name='div', attrs={'class':['box_Img newsdet_new ']}),
+                      dict(name='div', attrs={'class':['box_Img newsdet_as ']}),
+                      dict(name='table', attrs={'class':['table_A']}),
+                      dict(name='div', attrs={'class':['txt_Article txtBox_cms']}),
+                      dict(name='testoscheda')]
+
+    def parse_index(self):
+        feeds = []
+        for title, url in [
+             ("Prove su Strada"  , "http://www.auto.it/rss/prove+6.xml")
+            ]:
+            soup = self.index_to_soup(url)
+            soup = soup.find('channel')
+            print soup
+
+            for article in soup.findAllNext('item'):
+                title =  self.tag_to_string(article.title)
+                date = self.tag_to_string(article.pubDate)
+                description = self.tag_to_string(article.description)
+                link = self.tag_to_string(article.guid)
+#               print article
+                articles = self.create_links_append(link, date, description)
+                if articles:
+                   feeds.append((title, articles))
+            return feeds
+
+    def create_links_append(self, link, date, description):
+        current_articles = []
+
+        current_articles.append({'title': 'Generale', 'url': link,'description':description, 'date':date}),
+        current_articles.append({'title': 'Design', 'url': link.replace('scheda','design'),'description':'scheda', 'date':''}),
+        current_articles.append({'title': 'Interni', 'url': link.replace('scheda','interni'),'description':'Interni', 'date':''}),
+        current_articles.append({'title': 'Tecnica', 'url': link.replace('scheda','tecnica'),'description':'Tecnica', 'date':''}),
+        current_articles.append({'title': 'Su Strada', 'url': link.replace('scheda','su_strada'),'description':'Su Strada', 'date':''}),
+        current_articles.append({'title': 'Pagella', 'url': link.replace('scheda','pagella'),'description':'Pagella', 'date':''}),
+        current_articles.append({'title': 'Rilevamenti', 'url': link.replace('scheda','telemetria'),'description':'Rilevamenti', 'date':''})
+
+        return current_articles
+
+
+
+
+
diff --git a/resources/recipes/forbes_india.recipe b/resources/recipes/forbes_india.recipe
new file mode 100644
index 0000000000..8567f896b5
--- /dev/null
+++ b/resources/recipes/forbes_india.recipe
@@ -0,0 +1,55 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276934715(BasicNewsRecipe):
+    title          = u'Forbes India'
+    __author__            = 'rty'
+    description           = 'India Edition Forbes'
+    publisher             = 'Forbes India'
+    category              = 'Business News, Economy, India'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en_IN'
+    temp_files = []
+    articles_are_obfuscated = True
+    conversion_options = {'linearize_tables':True}
+    feeds          = [
+       (u'Contents', u'http://business.in.com/rssfeed/rss_all.xml'),
+                ]
+    extra_css = '''
+                   .t-10-gy-l{font-style: italic; font-size: small}
+                   .t-30-b-d{font-weight: bold; font-size: xx-large}
+                   .t-16-gy-l{font-weight: bold; font-size: x-large; font-syle: italic}
+                   .storycontent{font-size: 4px;font-family: Times New Roman;}
+                '''
+
+    remove_tags_before  = dict(name='div', attrs={'class':'pdl10 pdr15'})
+
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/printcontent/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def get_cover_url(self):
+        index = 'http://business.in.com/magazine/'
+        soup = self.index_to_soup(index)
+        for image in soup.findAll('a',{ "class" : "lbOn a-9-b-d" }):
+              return image['href']
+              #return image['href'] + '.jpg'
+        return None
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+           del item['style']
+        for item in soup.findAll(width=True):
+            del item['width']
+        return soup
diff --git a/resources/recipes/maximum_pc.recipe b/resources/recipes/maximum_pc.recipe
new file mode 100644
index 0000000000..3e4d8a58d9
--- /dev/null
+++ b/resources/recipes/maximum_pc.recipe
@@ -0,0 +1,43 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276930924(BasicNewsRecipe):
+    title          = u'Maximum PC'
+    __author__           = 'rty'
+    description           = 'Maximum PC'
+    publisher             = 'http://www.maximumpc.com'
+    category              = 'news, computer, technology'
+    language = 'en'
+    oldest_article = 30
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    temp_files = []
+    articles_are_obfuscated = True
+    feeds          = [(u'News', u'http://www.maximumpc.com/articles/4/feed'),
+                          (u'Reviews', u'http://www.maximumpc.com/articles/40/feed'),
+                          (u'Editors Blog', u'http://www.maximumpc.com/articles/6/feed'),
+                          (u'How-to', u'http://www.maximumpc.com/articles/32/feed'),
+                          (u'Features', u'http://www.maximumpc.com/articles/31/feed'),
+                           (u'From the Magazine', u'http://www.maximumpc.com/articles/72/feed')
+                         ]
+    keep_only_tags = [
+                               dict(name='div', attrs={'class':['print-title','article_body']}),
+                              ]
+    remove_tags = [
+                    dict(name='div', attrs={'class':'comments-tags-actions'}),
+                          ]
+    remove_tags_before  = dict(name='div', attrs={'class':'print-title'})
+    remove_tags_after     = dict(name='div', attrs={'class':'meta-content'})
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/print/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
diff --git a/resources/recipes/nytimes.recipe b/resources/recipes/nytimes.recipe
index ec546569e5..9fbcf6d3d1 100644
--- a/resources/recipes/nytimes.recipe
+++ b/resources/recipes/nytimes.recipe
@@ -17,6 +17,7 @@ class NYTimes(BasicNewsRecipe):
     title       = 'New York Times Top Stories'
     __author__  = 'GRiker'
     language = 'en'
+    requires_version = (0, 7, 3)
     description = 'Top Stories from the New York Times'
 
     # List of sections typically included in Top Stories.  Use a keyword from the
@@ -64,6 +65,7 @@ class NYTimes(BasicNewsRecipe):
     timefmt = ''
     needs_subscription = True
     masthead_url = 'http://graphics8.nytimes.com/images/misc/nytlogo379x64.gif'
+    cover_margins = (18,18,'grey99')
 
     remove_tags_before = dict(id='article')
     remove_tags_after  = dict(id='article')
@@ -183,6 +185,16 @@ class NYTimes(BasicNewsRecipe):
                 self.log("\nFailed to login")
         return br
 
+    def skip_ad_pages(self, soup):
+        # Skip ad pages served before actual article
+        skip_tag = soup.find(True, {'name':'skip'})
+        if skip_tag is not None:
+            self.log.warn("Found forwarding link: %s" % skip_tag.parent['href'])
+            url = 'http://www.nytimes.com' + re.sub(r'\?.*', '', skip_tag.parent['href'])
+            url += '?pagewanted=all'
+            self.log.warn("Skipping ad to article at '%s'" % url)
+            return self.index_to_soup(url, raw=True)
+
     def get_cover_url(self):
         cover = None
         st = time.localtime()
@@ -391,14 +403,6 @@ class NYTimes(BasicNewsRecipe):
         return ans
 
     def preprocess_html(self, soup):
-        # Skip ad pages served before actual article
-        skip_tag = soup.find(True, {'name':'skip'})
-        if skip_tag is not None:
-            self.log.error("Found forwarding link: %s" % skip_tag.parent['href'])
-            url = 'http://www.nytimes.com' + re.sub(r'\?.*', '', skip_tag.parent['href'])
-            url += '?pagewanted=all'
-            self.log.error("Skipping ad to article at '%s'" % url)
-            soup = self.index_to_soup(url)
         return self.strip_anchors(soup)
 
     def postprocess_html(self,soup, True):
diff --git a/resources/recipes/nytimes_sub.recipe b/resources/recipes/nytimes_sub.recipe
index c08b06572d..bcec51ce97 100644
--- a/resources/recipes/nytimes_sub.recipe
+++ b/resources/recipes/nytimes_sub.recipe
@@ -20,6 +20,7 @@ class NYTimes(BasicNewsRecipe):
     title       = 'The New York Times'
     __author__  = 'GRiker'
     language = 'en'
+    requires_version = (0, 7, 3)
 
     description = 'Daily news from the New York Times (subscription version)'
     allSectionKeywords = ['The Front Page', 'International','National','Obituaries','Editorials',
@@ -103,6 +104,7 @@ class NYTimes(BasicNewsRecipe):
                             ]),
                    dict(name=['script', 'noscript', 'style'])]
     masthead_url = 'http://graphics8.nytimes.com/images/misc/nytlogo379x64.gif'
+    cover_margins = (18,18,'grey99')
     no_stylesheets = True
     extra_css = '.headline      {text-align:    left;}\n    \
                  .byline        {font-family:   monospace;  \
@@ -158,7 +160,7 @@ class NYTimes(BasicNewsRecipe):
         return cover
 
     def get_masthead_title(self):
-        return 'NYTimes GR Version'
+        return self.title
 
     def dump_ans(self, ans):
         total_article_count = 0
@@ -279,15 +281,17 @@ class NYTimes(BasicNewsRecipe):
         self.dump_ans(ans)
         return ans
 
-    def preprocess_html(self, soup):
+    def skip_ad_pages(self, soup):
         # Skip ad pages served before actual article
         skip_tag = soup.find(True, {'name':'skip'})
         if skip_tag is not None:
-            self.log.error("Found forwarding link: %s" % skip_tag.parent['href'])
+            self.log.warn("Found forwarding link: %s" % skip_tag.parent['href'])
             url = 'http://www.nytimes.com' + re.sub(r'\?.*', '', skip_tag.parent['href'])
             url += '?pagewanted=all'
-            self.log.error("Skipping ad to article at '%s'" % url)
-            soup = self.index_to_soup(url)
+            self.log.warn("Skipping ad to article at '%s'" % url)
+            return self.index_to_soup(url, raw=True)
+
+    def preprocess_html(self, soup):
         return self.strip_anchors(soup)
 
     def postprocess_html(self,soup, True):
diff --git a/resources/recipes/psych.recipe b/resources/recipes/psych.recipe
index 46290450cb..3fc940b4a2 100644
--- a/resources/recipes/psych.recipe
+++ b/resources/recipes/psych.recipe
@@ -1,39 +1,44 @@
+
+from calibre.ptempfile import PersistentTemporaryFile
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup
 
-class PsychologyToday(BasicNewsRecipe):
+class AdvancedUserRecipe1275708473(BasicNewsRecipe):
     title          = u'Psychology Today'
-    language       = 'en'
-    __author__     = 'Krittika Goyal'
-    oldest_article = 1 #days
-    max_articles_per_feed = 25
-    #encoding = 'latin1'
-
-    remove_stylesheets = True
-    #remove_tags_before = dict(name='h1', attrs={'class':'heading'})
-    #remove_tags_after  = dict(name='td', attrs={'class':'newptool1'})
+    _author__ = 'rty'
+    publisher = u'www.psychologytoday.com'
+    category = u'Psychology'
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    temp_files = []
+    articles_are_obfuscated = True
     remove_tags = [
-       dict(name='iframe'),
-       dict(name='div', attrs={'class':['pt-box-title', 'pt-box-content', 'blog-entry-footer', 'item-list', 'article-sub-meta']}),
-       dict(name='div', attrs={'id':['block-td_search_160', 'block-cam_search_160']}),
-       #dict(name='ul', attrs={'class':'article-tools'}),
-       #dict(name='ul', attrs={'class':'articleTools'}),
-    ]
+                    dict(name='div', attrs={'class':['print-source_url','field-items','print-footer']}),
+                    dict(name='span', attrs={'class':'print-footnote'}),
+                  ]
+    remove_tags_before  = dict(name='h1', attrs={'class':'print-title'})
+    remove_tags_after     = dict(name='div', attrs={'class':['field-items','print-footer']})
 
-    feeds          = [
-('PSY TODAY',
- 'http://www.psychologytoday.com/articles/index.rss'),
-]
+    feeds          = [(u'Contents', u'http://www.psychologytoday.com/articles/index.rss')]
 
-    def preprocess_html(self, soup):
-        story = soup.find(name='div', attrs={'id':'contentColumn'})
-        #td = heading.findParent(name='td')
-        #td.extract()
-        soup = BeautifulSoup('<html><head><title>t</title></head><body></body></html>')
-        body = soup.find(name='body')
-        body.insert(0, story)
-        for x in soup.findAll(name='p', text=lambda x:x and '--&gt;' in x):
-             p = x.findParent('p')
-             if p is not None:
-                  p.extract()
-        return soup
+    def get_article_url(self, article):
+       return article.get('link',  None)
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/print/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def get_cover_url(self):
+        index = 'http://www.psychologytoday.com/magazine/'
+        soup = self.index_to_soup(index)
+        for image in soup.findAll('img',{ "class" : "imagefield imagefield-field_magazine_cover" }):
+              return image['src'] + '.jpg'
+        return None
diff --git a/resources/recipes/today_online.recipe b/resources/recipes/today_online.recipe
new file mode 100644
index 0000000000..e2fc229473
--- /dev/null
+++ b/resources/recipes/today_online.recipe
@@ -0,0 +1,59 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276486274(BasicNewsRecipe):
+    title          = u'Today Online - Singapore'
+    publisher             = 'MediaCorp Press Ltd - Singapore'
+    __author__ = 'rty'
+    category              = 'news, Singapore'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en_SG'
+    temp_files = []
+    articles_are_obfuscated = True
+    masthead_url = 'http://www.todayonline.com/App_Themes/Default/images/icons/TodayOnlineLogo.gif'
+    conversion_options = {'linearize_tables':True}
+    extra_css = '''
+                   .author{font-style: italic; font-size: small}
+                   .date{font-style: italic; font-size: small}
+                   .Headline{font-weight: bold; font-size: xx-large}
+                   .headerStrap{font-weight: bold; font-size: x-large; font-syle: italic}
+                   .bodyText{font-size: 4px;font-family: Times New Roman;}
+                '''
+    keep_only_tags = [
+                                       dict(name='div', attrs={'id':['fullPrintBodyHolder']})
+                        ]
+    remove_tags_after = [  dict(name='div', attrs={'class':'button'})]
+
+
+    remove_tags = [
+                    dict(name='div', attrs={'class':['url','button']})
+                         ]
+    feeds          = [
+                         (u'Singapore', u'http://www.todayonline.com/RSS/Singapore'),
+                         (u'Hot News', u'http://www.todayonline.com/RSS/Hotnews'),
+                        (u'Today Online', u'http://www.todayonline.com/RSS/Todayonline'),
+                        (u'Voices', u'http://www.todayonline.com/RSS/Voices'),
+                        (u'Commentary', u'http://www.todayonline.com/RSS/Commentary'),
+                        (u'World', u'http://www.todayonline.com/RSS/World'),
+                        (u'Business', u'http://www.todayonline.com/RSS/Business'),
+                        (u'Column', u'http://www.todayonline.com/RSS/Columns'),
+                      ]
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/Print/', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+           del item['style']
+        return soup
diff --git a/resources/recipes/wsj.recipe b/resources/recipes/wsj.recipe
index 2e99a690f4..fd5e977d10 100644
--- a/resources/recipes/wsj.recipe
+++ b/resources/recipes/wsj.recipe
@@ -4,13 +4,14 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
 from calibre.web.feeds.news import BasicNewsRecipe
+import copy
 
 # http://online.wsj.com/page/us_in_todays_paper.html
 
 class WallStreetJournal(BasicNewsRecipe):
 
-    title = 'The Wall Street Journal (US)'
-    __author__ = 'Kovid Goyal and Sujata Raman'
+    title = 'The Wall Street Journal'
+    __author__ = 'Kovid Goyal, Sujata Raman, and Joshua Oster-Morris'
     description = 'News and current affairs'
     needs_subscription = True
     language = 'en'
@@ -67,6 +68,16 @@ class WallStreetJournal(BasicNewsRecipe):
     def wsj_get_index(self):
         return self.index_to_soup('http://online.wsj.com/itp')
 
+    def wsj_add_feed(self,feeds,title,url):
+        self.log('Found section:', title)
+        if url.endswith('whatsnews'):
+           articles = self.wsj_find_wn_articles(url)
+        else:
+           articles = self.wsj_find_articles(url)
+        if articles:
+           feeds.append((title, articles))
+        return feeds  
+
     def parse_index(self):
         soup = self.wsj_get_index()
 
@@ -82,25 +93,62 @@ class WallStreetJournal(BasicNewsRecipe):
         div = soup.find('div', attrs={'class':'itpHeader'})
         div = div.find('ul', attrs={'class':'tab'})
         for a in div.findAll('a', href=lambda x: x and '/itp/' in x):
-            title = self.tag_to_string(a)
-            url = 'http://online.wsj.com' + a['href']
-            self.log('Found section:', title)
-            articles = self.wsj_find_articles(url)
-            if articles:
-                feeds.append((title, articles))
-
+            pageone = a['href'].endswith('pageone')
+            if pageone:
+               title = 'Front Section'
+               url = 'http://online.wsj.com' + a['href']
+               feeds = self.wsj_add_feed(feeds,title,url)
+               title = 'What''s News'
+               url = url.replace('pageone','whatsnews')             
+               feeds = self.wsj_add_feed(feeds,title,url)
+            else:
+               title = self.tag_to_string(a)
+               url = 'http://online.wsj.com' + a['href']
+               feeds = self.wsj_add_feed(feeds,title,url)
         return feeds
 
+    def wsj_find_wn_articles(self, url):
+        soup = self.index_to_soup(url)
+        articles = []
+
+        whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
+        if whats_news is not None:
+          for a in whats_news.findAll('a', href=lambda x: x and '/article/' in x):
+            container = a.findParent(['p'])
+            meta = a.find(attrs={'class':'meta_sectionName'})
+            if meta is not None:
+                meta.extract()
+            title = self.tag_to_string(a).strip()
+            url = a['href']
+            desc = ''
+            if container is not None:
+                desc = self.tag_to_string(container)
+
+            articles.append({'title':title, 'url':url,
+                'description':desc, 'date':''})
+
+            self.log('\tFound WN article:', title)
+
+        return articles
+
     def wsj_find_articles(self, url):
         soup = self.index_to_soup(url)
 
-        whats_news = soup.find('div', attrs={'class':lambda x: x and
-            'whatsNews-simple' in x})
+        whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
         if whats_news is not None:
-            whats_news.extract()
+           whats_news.extract()
 
         articles = []
 
+        flavorarea = soup.find('div', attrs={'class':lambda x: x and 'ahed' in x})
+        if flavorarea is not None:        
+           flavorstory = flavorarea.find('a', href=lambda x: x and x.startswith('/article'))
+           if flavorstory is not None:
+              flavorstory['class'] = 'mjLinkItem'
+              metapage = soup.find('span', attrs={'class':lambda x: x and 'meta_sectionName' in x})
+              if metapage is not None:
+                 flavorstory.append( copy.copy(metapage) ) #metapage should always be A1 because that should be first on the page
+
         for a in soup.findAll('a', attrs={'class':'mjLinkItem'}, href=True):
             container = a.findParent(['li', 'div'])
             meta = a.find(attrs={'class':'meta_sectionName'})
@@ -118,26 +166,9 @@ class WallStreetJournal(BasicNewsRecipe):
 
             self.log('\tFound article:', title)
 
-            '''
-            # Find related articles
-            a.extract()
-            for a in container.findAll('a', href=lambda x: x and '/article/'
-                    in x and 'articleTabs' not in x):
-                url = a['href']
-                if not url.startswith('http:'):
-                    url = 'http://online.wsj.com'+url
-                title = self.tag_to_string(a).strip()
-                if not title or title.startswith('['): continue
-                if title:
-                    articles.append({'title':self.tag_to_string(a),
-                        'url':url, 'description':'', 'date':''})
-                    self.log('\t\tFound related:', title)
-            '''
-
         return articles
 
 
     def cleanup(self):
         self.browser.open('http://online.wsj.com/logout?url=http://online.wsj.com')
 
-
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 4f9e1f3904..0cc188503f 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.7.2'
+__version__   = '0.7.4'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 7a90343c29..a994efb0f6 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -6,8 +6,7 @@ __docformat__ = 'restructuredtext en'
 
 
 import cStringIO, ctypes, datetime, os, re, shutil, subprocess, sys, tempfile, time
-
-from calibre.constants import DEBUG
+from calibre.constants import __appname__, __version__, DEBUG
 from calibre import fit_image
 from calibre.constants import isosx, iswindows
 from calibre.devices.errors import UserFeedback
@@ -79,7 +78,7 @@ class ITUNES(DevicePlugin):
     supported_platforms = ['osx','windows']
     author = 'GRiker'
     #: The version of this plugin as a 3-tuple (major, minor, revision)
-    version        = (0,6,0)
+    version        = (0,7,0)
 
     OPEN_FEEDBACK_MESSAGE = _(
         'Apple device detected, launching iTunes, please wait ...')
@@ -160,6 +159,7 @@ class ITUNES(DevicePlugin):
     sources = None
     update_msg = None
     update_needed = False
+    use_series_data = True
 
     # Public methods
     def add_books_to_metadata(self, locations, metadata, booklists):
@@ -293,7 +293,7 @@ class ITUNES(DevicePlugin):
                          'author':[book.artist()],
                          'lib_book':library_books[this_book.path] if this_book.path in library_books else None,
                          'dev_book':book,
-                         'uuid': book.album()
+                         'uuid': book.composer()
                          }
 
                         if self.report_progress is not None:
@@ -329,7 +329,7 @@ class ITUNES(DevicePlugin):
                              'title':book.Name,
                              'author':book.Artist,
                              'lib_book':library_books[this_book.path] if this_book.path in library_books else None,
-                             'uuid': book.Album
+                             'uuid': book.Composer
                              }
 
                             if self.report_progress is not None:
@@ -398,7 +398,7 @@ class ITUNES(DevicePlugin):
                         attempts -= 1
                         time.sleep(0.5)
                         if DEBUG:
-                            self.log.warning(" waiting for identified iPad, attempt #%d" % (10 - attempts))
+                            self.log.warning(" waiting for connected iPad, attempt #%d" % (10 - attempts))
                     else:
                         if DEBUG:
                             self.log.info(' found connected iPad')
@@ -474,7 +474,7 @@ class ITUNES(DevicePlugin):
                             attempts -= 1
                             time.sleep(0.5)
                             if DEBUG:
-                                self.log.warning(" waiting for identified iPad, attempt #%d" % (10 - attempts))
+                                self.log.warning(" waiting for connected iPad, attempt #%d" % (10 - attempts))
                         else:
                             if DEBUG:
                                 self.log.info(' found connected iPad in iTunes')
@@ -693,6 +693,8 @@ class ITUNES(DevicePlugin):
 
             # Purge the booklist, self.cached_books
             for i,bl_book in enumerate(booklists[0]):
+                if False:
+                    self.log.info(" evaluating '%s'" % bl_book.uuid)
                 if bl_book.uuid == self.cached_books[path]['uuid']:
                     # Remove from booklists[0]
                     booklists[0].pop(i)
@@ -703,6 +705,10 @@ class ITUNES(DevicePlugin):
                             break
                     break
 
+        if False:
+            self._dump_booklist(booklists[0], indent = 2)
+            self._dump_cached_books(indent=2)
+
     def reset(self, key='-1', log_packets=False, report_progress=None,
             detected_device=None) :
         """
@@ -1061,7 +1067,7 @@ class ITUNES(DevicePlugin):
                     except:
                         if DEBUG:
                             self.log.warning("  iTunes automation interface reported an error"
-                                             " when adding artwork to '%s'" % metadata.title)
+                                             " when adding artwork to '%s' on the iDevice" % metadata.title)
                         #import traceback
                         #traceback.print_exc()
                         #from calibre import ipython
@@ -1264,18 +1270,18 @@ class ITUNES(DevicePlugin):
     def _dump_cached_book(self, cached_book, header=None,indent=0):
         '''
         '''
-        if header:
-            msg = '%s%s' % (' '*indent,header)
-            self.log.info(msg)
-            self.log.info( "%s%s" % (' '*indent, '-' * len(msg)))
         if isosx:
-            self.log.info("%s%-40.40s %-30.30s %-10.10s %-10.10s %s" %
-             (' '*indent,
-              'title',
-              'author',
-              'lib_book',
-              'dev_book',
-              'uuid'))
+            if header:
+                msg = '%s%s' % (' '*indent,header)
+                self.log.info(msg)
+                self.log.info( "%s%s" % (' '*indent, '-' * len(msg)))
+                self.log.info("%s%-40.40s %-30.30s %-10.10s %-10.10s %s" %
+                 (' '*indent,
+                  'title',
+                  'author',
+                  'lib_book',
+                  'dev_book',
+                  'uuid'))
             self.log.info("%s%-40.40s %-30.30s %-10.10s %-10.10s %s" %
              (' '*indent,
               cached_book['title'],
@@ -1284,14 +1290,17 @@ class ITUNES(DevicePlugin):
               str(cached_book['dev_book'])[-9:],
               cached_book['uuid']))
         elif iswindows:
+            if header:
+                msg = '%s%s' % (' '*indent,header)
+                self.log.info(msg)
+                self.log.info( "%s%s" % (' '*indent, '-' * len(msg)))
+
             self.log.info("%s%-40.40s %-30.30s %s" %
              (' '*indent,
               cached_book['title'],
               cached_book['author'],
               cached_book['uuid']))
 
-        self.log.info()
-
     def _dump_cached_books(self, header=None, indent=0):
         '''
         '''
@@ -1415,19 +1424,21 @@ class ITUNES(DevicePlugin):
                               (search['uuid'], search['title'], search['author']))
             attempts = 9
             while attempts:
-                # Try by uuid
-                hits = dev_books.Search(search['uuid'],self.SearchField.index('Albums'))
+                # Try by uuid - only one hit
+                hits = dev_books.Search(search['uuid'],self.SearchField.index('All'))
                 if hits:
                     hit = hits[0]
-                    self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Album))
+                    self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
                     return hit
 
-                # Try by author
+                # Try by author - there could be multiple hits
                 hits = dev_books.Search(search['author'],self.SearchField.index('Artists'))
                 if hits:
-                    hit = hits[0]
-                    self.log.info("  found '%s' by %s" % (hit.Name, hit.Artist))
-                    return hit
+                    for hit in hits:
+                        if hit.Name == search['title']:
+                            if DEBUG:
+                                self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+                            return hit
 
                 attempts -= 1
                 time.sleep(0.5)
@@ -1438,19 +1449,19 @@ class ITUNES(DevicePlugin):
                 self.log.error("  no hits")
             return None
 
-    def _find_library_book(self, cached_book):
+    def _find_library_book(self, search):
         '''
         Windows-only method to get a handle to a library book in the current pythoncom session
         '''
         if iswindows:
             if DEBUG:
                 self.log.info(" ITUNES._find_library_book()")
-                if 'uuid' in cached_book:
+                if 'uuid' in search:
                     self.log.info("  looking for '%s' by %s (%s)" %
-                                (cached_book['title'], cached_book['author'], cached_book['uuid']))
+                                (search['title'], search['author'], search['uuid']))
                 else:
                     self.log.info("  looking for '%s' by %s" %
-                                (cached_book['title'], cached_book['author']))
+                                (search['title'], search['author']))
 
             for source in self.iTunes.sources:
                 if source.Kind == self.Sources.index('Library'):
@@ -1477,22 +1488,26 @@ class ITUNES(DevicePlugin):
 
             attempts = 9
             while attempts:
-                # Find book whose Album field = cached_book['uuid']
-                if 'uuid' in cached_book:
-                    hits = lib_books.Search(cached_book['uuid'],self.SearchField.index('Albums'))
+                # Find book whose Album field = search['uuid']
+                if 'uuid' in search:
+                    if DEBUG:
+                        self.log.info("   searching by uuid '%s' ..." % search['uuid'])
+                    hits = lib_books.Search(search['uuid'],self.SearchField.index('All'))
                     if hits:
                         hit = hits[0]
                         if DEBUG:
-                            self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Album))
+                            self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
                         return hit
 
-                hits = lib_books.Search(cached_book['author'],self.SearchField.index('Artists'))
+                if DEBUG:
+                    self.log.info("   searching by author '%s' ..." % search['author'])
+                hits = lib_books.Search(search['author'],self.SearchField.index('Artists'))
                 if hits:
-                    hit = hits[0]
-                    if hit.Name == cached_book['title']:
-                        if DEBUG:
-                            self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Album))
-                        return hit
+                    for hit in hits:
+                        if hit.Name == search['title']:
+                            if DEBUG:
+                                self.log.info("  found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+                            return hit
 
                 attempts -= 1
                 time.sleep(0.5)
@@ -1500,7 +1515,7 @@ class ITUNES(DevicePlugin):
                     self.log.warning("   attempt #%d" % (10 - attempts))
 
             if DEBUG:
-                self.log.error("  search for '%s' yielded no hits" % cached_book['title'])
+                self.log.error("  search for '%s' yielded no hits" % search['title'])
             return None
 
     def _generate_thumbnail(self, book_path, book):
@@ -1542,6 +1557,10 @@ class ITUNES(DevicePlugin):
                 return thumb.getvalue()
             except:
                 self.log.error("  error generating thumb for '%s'" % book.name())
+                try:
+                    zfw.close()
+                except:
+                    pass
                 return None
 
         elif iswindows:
@@ -1571,6 +1590,10 @@ class ITUNES(DevicePlugin):
                 return thumb.getvalue()
             except:
                 self.log.error("  error generating thumb for '%s'" % book.Name)
+                try:
+                    zfw.close()
+                except:
+                    pass
                 return None
 
     def _get_device_book_size(self, file, compressed_size):
@@ -1617,7 +1640,7 @@ class ITUNES(DevicePlugin):
                             self.log.info("   ignoring '%s' of type '%s'" % (book.name(), book.kind()))
                     else:
                         if DEBUG:
-                            self.log.info("   %-30.30s %-30.30s %s [%s]" %
+                            self.log.info("   %-30.30s %-30.30s %-40.40s [%s]" %
                                           (book.name(), book.artist(), book.album(), book.kind()))
                         device_books.append(book)
                 if DEBUG:
@@ -1649,7 +1672,7 @@ class ITUNES(DevicePlugin):
                                 self.log.info("   ignoring '%s' of type '%s'" % (book.Name, book.KindAsString))
                         else:
                             if DEBUG:
-                                self.log.info("   %-30.30s %-30.30s %s [%s]" % (book.Name, book.Artist, book.Album, book.KindAsString))
+                                self.log.info("   %-30.30s %-30.30s %-40.40s [%s]" % (book.Name, book.Artist, book.Album, book.KindAsString))
                             device_books.append(book)
                     if DEBUG:
                         self.log.info()
@@ -1663,8 +1686,6 @@ class ITUNES(DevicePlugin):
         '''
         assumes pythoncom wrapper
         '''
-#         if DEBUG:
-#             self.log.info(" ITUNES._get_device_books_playlist()")
         if iswindows:
             if 'iPod' in self.sources:
                 pl = None
@@ -1707,11 +1728,6 @@ class ITUNES(DevicePlugin):
         if update_md:
             self._update_epub_metadata(fpath, metadata)
 
-#             if DEBUG:
-#                 self.log.info("   metadata before rewrite: '{0[0]}' '{0[1]}' '{0[2]}'".format(self._dump_epub_metadata(fpath)))
-#             self._update_epub_metadata(fpath, metadata)
-#             if DEBUG:
-#                 self.log.info("   metadata after rewrite: '{0[0]}' '{0[1]}' '{0[2]}'".format(self._dump_epub_metadata(fpath)))
         return fpath
 
     def _get_library_books(self):
@@ -1766,7 +1782,7 @@ class ITUNES(DevicePlugin):
 
                             library_books[path] = book
                             if DEBUG:
-                                self.log.info("   %-30.30s %-30.30s %s [%s]" % (book.name(), book.artist(), book.album(), book.kind()))
+                                self.log.info("   %-30.30s %-30.30s %-40.40s [%s]" % (book.name(), book.artist(), book.album(), book.kind()))
                 else:
                     if DEBUG:
                         self.log.info('  no Library playlists')
@@ -1819,7 +1835,7 @@ class ITUNES(DevicePlugin):
 
                             library_books[path] = book
                             if DEBUG:
-                                self.log.info("   %-30.30s %-30.30s %s [%s]" % (book.Name, book.Artist, book.Album, book.KindAsString))
+                                self.log.info("   %-30.30s %-30.30s %-40.40s [%s]" % (book.Name, book.Artist, book.Album, book.KindAsString))
                 except:
                     if DEBUG:
                         self.log.info(" no books in library")
@@ -1852,8 +1868,12 @@ class ITUNES(DevicePlugin):
         Check for >1 iPod device connected to iTunes
         '''
         if isosx:
-            names = [s.name() for s in self.iTunes.sources()]
-            kinds = [str(s.kind()).rpartition('.')[2] for s in self.iTunes.sources()]
+            try:
+                names = [s.name() for s in self.iTunes.sources()]
+                kinds = [str(s.kind()).rpartition('.')[2] for s in self.iTunes.sources()]
+            except:
+                # User probably quit iTunes
+                return {}
         elif iswindows:
             # Assumes a pythoncom wrapper
             it_sources = ['Unknown','Library','iPod','AudioCD','MP3CD','Device','RadioTuner','SharedLibrary']
@@ -1912,6 +1932,7 @@ class ITUNES(DevicePlugin):
                 self.log.error("  could not confirm valid iTunes.media_dir from %s" % 'com.apple.itunes')
                 self.log.error("  media_dir: %s" % media_dir)
             if DEBUG:
+                self.log.info("  %s %s" % (__appname__, __version__))
                 self.log.info("  [OSX %s - %s (%s), driver version %d.%d.%d]" %
                  (self.iTunes.name(), self.iTunes.version(), self.initial_status,
                   self.version[0],self.version[1],self.version[2]))
@@ -1941,6 +1962,7 @@ class ITUNES(DevicePlugin):
                     self.log.error("  '%s' not found" % media_dir)
 
             if DEBUG:
+                self.log.info("  %s %s" % (__appname__, __version__))
                 self.log.info("  [Windows %s - %s (%s), driver version %d.%d.%d]" %
                  (self.iTunes.Windows[0].name, self.iTunes.Version, self.initial_status,
                   self.version[0],self.version[1],self.version[2]))
@@ -2028,7 +2050,7 @@ class ITUNES(DevicePlugin):
 
         elif iswindows:
             dev_pl = self._get_device_books_playlist()
-            hits = dev_pl.Search(cached_book['uuid'],self.SearchField.index('Albums'))
+            hits = dev_pl.Search(cached_book['uuid'],self.SearchField.index('All'))
             if hits:
                 hit = hits[0]
                 if False:
@@ -2082,7 +2104,7 @@ class ITUNES(DevicePlugin):
                 self.iTunes.delete(cached_book['lib_book'])
             except:
                 if DEBUG:
-                    self.log.info("   '%s' not found in iTunes" % cached_book['title'])
+                    self.log.info("   unable to remove '%s' from iTunes" % cached_book['title'])
 
         elif iswindows:
             '''
@@ -2094,13 +2116,14 @@ class ITUNES(DevicePlugin):
                 path = book.Location
             except:
                 book = self._find_library_book(cached_book)
+                path = book.Location
 
             if book:
-                storage_path = os.path.split(book.Location)
-                if book.Location.startswith(self.iTunes_media):
+                storage_path = os.path.split(path)
+                if path.startswith(self.iTunes_media):
                     if DEBUG:
                         self.log.info("   removing '%s' at %s" %
-                            (cached_book['title'], book.Location))
+                            (cached_book['title'], path))
                     try:
                         os.remove(path)
                     except:
@@ -2121,7 +2144,7 @@ class ITUNES(DevicePlugin):
                 book.Delete()
             except:
                 if DEBUG:
-                    self.log.info("   '%s' not found in iTunes" % cached_book['title'])
+                    self.log.info("   unable to remove '%s' from iTunes" % cached_book['title'])
 
     def _update_epub_metadata(self, fpath, metadata):
         '''
@@ -2130,21 +2153,6 @@ class ITUNES(DevicePlugin):
 
         # Refresh epub metadata
         with open(fpath,'r+b') as zfo:
-            '''
-            # Touch the timestamp to force a recache
-            if metadata.timestamp:
-                if DEBUG:
-                    self.log.info("   old timestamp: %s" % metadata.timestamp)
-                old_ts = metadata.timestamp
-                metadata.timestamp = datetime.datetime(old_ts.year, old_ts.month, old_ts.day, old_ts.hour,
-                                           old_ts.minute, old_ts.second, old_ts.microsecond+1, old_ts.tzinfo)
-                if DEBUG:
-                    self.log.info("   new timestamp: %s" % metadata.timestamp)
-            else:
-                metadata.timestamp = isoformat(now())
-                if DEBUG:
-                    self.log.info("   add timestamp: %s" % metadata.timestamp)
-            '''
             # Touch the OPF timestamp
             zf_opf = ZipFile(fpath,'r')
             fnames = zf_opf.namelist()
@@ -2243,14 +2251,16 @@ class ITUNES(DevicePlugin):
 
         if isosx:
             if lb_added:
-                lb_added.album.set(metadata.uuid)
+                lb_added.album.set(metadata.title)
+                lb_added.composer.set(metadata.uuid)
                 lb_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
                 lb_added.enabled.set(True)
                 lb_added.sort_artist.set(metadata.author_sort.title())
                 lb_added.sort_name.set(this_book.title_sorter)
 
             if db_added:
-                db_added.album.set(metadata.uuid)
+                db_added.album.set(metadata.title)
+                db_added.composer.set(metadata.uuid)
                 db_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
                 db_added.enabled.set(True)
                 db_added.sort_artist.set(metadata.author_sort.title())
@@ -2273,16 +2283,20 @@ class ITUNES(DevicePlugin):
                     pass
 
             # Set genre from series if available, else first alpha tag
-            # Otherwise iTunes grabs the first dc:subject from the opf metadata,
-            if metadata.series:
+            # Otherwise iTunes grabs the first dc:subject from the opf metadata
+            if self.use_series_data and metadata.series:
                 if lb_added:
+                    lb_added.sort_name.set("%s %03d" % (metadata.series, metadata.series_index))
                     lb_added.genre.set(metadata.series)
                     lb_added.episode_ID.set(metadata.series)
                     lb_added.episode_number.set(metadata.series_index)
+
                 if db_added:
+                    db_added.sort_name.set("%s %03d" % (metadata.series, metadata.series_index))
                     db_added.genre.set(metadata.series)
                     db_added.episode_ID.set(metadata.series)
                     db_added.episode_number.set(metadata.series_index)
+
             elif metadata.tags:
                 for tag in metadata.tags:
                     if self._is_alpha(tag[0]):
@@ -2294,14 +2308,16 @@ class ITUNES(DevicePlugin):
 
         elif iswindows:
             if lb_added:
-                lb_added.Album = metadata.uuid
+                lb_added.Album = metadata.title
+                lb_added.Composer = metadata.uuid
                 lb_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
                 lb_added.Enabled = True
                 lb_added.SortArtist = (metadata.author_sort.title())
                 lb_added.SortName = (this_book.title_sorter)
 
             if db_added:
-                db_added.Album = metadata.uuid
+                db_added.Album = metadata.title
+                db_added.Composer = metadata.uuid
                 db_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
                 db_added.Enabled = True
                 db_added.SortArtist = (metadata.author_sort.title())
@@ -2323,36 +2339,38 @@ class ITUNES(DevicePlugin):
                 except:
                     if DEBUG:
                         self.log.warning("  iTunes automation interface reported an error"
-                                         " setting AlbumRating")
+                                         " setting AlbumRating on iDevice")
 
-            # Set Category from first alpha tag, overwrite with series if available
+            # Set Genre from first alpha tag, overwrite with series if available
             # Otherwise iBooks uses first <dc:subject> from opf
             # iTunes balks on setting EpisodeNumber, but it sticks (9.1.1.12)
 
-            if metadata.series:
+            if self.use_series_data and metadata.series:
                 if lb_added:
-                    lb_added.Category = metadata.series
+                    lb_added.SortName = "%s %03d" % (metadata.series, metadata.series_index)
+                    lb_added.Genre = metadata.series
                     lb_added.EpisodeID = metadata.series
                     try:
                         lb_added.EpisodeNumber = metadata.series_index
                     except:
                         pass
                 if db_added:
-                    db_added.Category = metadata.series
+                    db_added.SortName = "%s %03d" % (metadata.series, metadata.series_index)
+                    db_added.Genre = metadata.series
                     db_added.EpisodeID = metadata.series
                     try:
                         db_added.EpisodeNumber = metadata.series_index
                     except:
                         if DEBUG:
                             self.log.warning("  iTunes automation interface reported an error"
-                                             " setting EpisodeNumber")
+                                             " setting EpisodeNumber on iDevice")
             elif metadata.tags:
                 for tag in metadata.tags:
                     if self._is_alpha(tag[0]):
                         if lb_added:
-                            lb_added.Category = tag
+                            lb_added.Genre = tag
                         if db_added:
-                            db_added.Category = tag
+                            db_added.Genre = tag
                         break
 
 
diff --git a/src/calibre/ebooks/epub/output.py b/src/calibre/ebooks/epub/output.py
index 8708b98d97..75739e6a69 100644
--- a/src/calibre/ebooks/epub/output.py
+++ b/src/calibre/ebooks/epub/output.py
@@ -84,7 +84,7 @@ class EPUBOutput(OutputFormatPlugin):
 
         OptionRecommendation(name='no_svg_cover', recommended_value=False,
             help=_('Do not use SVG for the book cover. Use this option if '
-                'your EPUB is going to be used ona  device that does not '
+                'your EPUB is going to be used on a device that does not '
                 'support SVG, like the iPhone or the JetBook Lite. '
                 'Without this option, such devices will display the cover '
                 'as a blank page.')
diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 8759dd360b..f87f8886a5 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -93,10 +93,16 @@ class CoverView(QWidget): # {{{
         self._current_pixmap_size = val
 
     def do_layout(self):
+        if self.rect().width() == 0 or self.rect().height() == 0:
+            return
         pixmap = self.pixmap
         pwidth, pheight = pixmap.width(), pixmap.height()
-        self.pwidth, self.pheight = fit_image(pwidth, pheight,
+        try:
+            self.pwidth, self.pheight = fit_image(pwidth, pheight,
                             self.rect().width(), self.rect().height())[1:]
+        except:
+            self.pwidth, self.pheight = self.rect().width()-1, \
+                    self.rect().height()-1
         self.current_pixmap_size = QSize(self.pwidth, self.pheight)
         self.animation.setEndValue(self.current_pixmap_size)
 
@@ -120,7 +126,8 @@ class CoverView(QWidget): # {{{
         self.data = {'id':data.get('id', None)}
         if data.has_key('cover'):
             self.pixmap = QPixmap.fromImage(data.pop('cover'))
-            if self.pixmap.isNull():
+            if self.pixmap.isNull() or self.pixmap.width() < 5 or \
+                    self.pixmap.height() < 5:
                 self.pixmap = self.default_pixmap
         else:
             self.pixmap = self.default_pixmap
diff --git a/src/calibre/gui2/cover_flow.py b/src/calibre/gui2/cover_flow.py
index 6a9709cd8b..c5ac474b0d 100644
--- a/src/calibre/gui2/cover_flow.py
+++ b/src/calibre/gui2/cover_flow.py
@@ -205,8 +205,8 @@ class CoverFlowMixin(object):
                     sm.select(index, sm.ClearAndSelect|sm.Rows)
                     self.library_view.setCurrentIndex(index)
         except:
-            pass
-
+            import traceback
+            traceback.print_exc()
 
     def sync_listview_to_cf(self, row):
         self.cf_last_updated_at = time.time()
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 36faee6dcb..33191d1773 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1355,10 +1355,12 @@ class DeviceMixin(object): # {{{
             # library view. In this case, simply give up
             if not hasattr(self, 'library_view') or self.library_view is None:
                 return
+            db = getattr(self.library_view.model(), 'db', None)
+            if db is None:
+                return
             # Build a cache (map) of the library, so the search isn't On**2
             self.db_book_title_cache = {}
             self.db_book_uuid_cache = {}
-            db = self.library_view.model().db
             for id in db.data.iterallids():
                 mi = db.get_metadata(id, index_is_id=True)
                 title = re.sub('(?u)\W|[_]', '', mi.title.lower())
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 2fb94c8085..b949306294 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -371,7 +371,7 @@ class BooksView(QTableView): # {{{
     # Context Menu {{{
     def set_context_menu(self, edit_metadata, send_to_device, convert, view,
                          save, open_folder, book_details, delete,
-                         add_to_library, similar_menu=None):
+                         similar_menu=None, add_to_library=None):
         self.setContextMenuPolicy(Qt.DefaultContextMenu)
         self.context_menu = QMenu(self)
         if edit_metadata is not None:
diff --git a/src/calibre/gui2/pictureflow/pictureflow.cpp b/src/calibre/gui2/pictureflow/pictureflow.cpp
index e96fc00cc2..d1434e763c 100644
--- a/src/calibre/gui2/pictureflow/pictureflow.cpp
+++ b/src/calibre/gui2/pictureflow/pictureflow.cpp
@@ -496,6 +496,7 @@ int PictureFlowPrivate::currentSlide() const
 
 void PictureFlowPrivate::setCurrentSlide(int index)
 {
+  animateTimer.stop();
   step = 0;
   centerIndex = qBound(index, 0, slideImages->count()-1);
   target = centerIndex;
diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py
index a5f9ddb4f0..57b355045a 100644
--- a/src/calibre/library/custom_columns.py
+++ b/src/calibre/library/custom_columns.py
@@ -506,7 +506,7 @@ class CustomColumns(object):
                           ratings as r
                      WHERE {lt}.value={table}.id and bl.book={lt}.book and
                            r.id = bl.rating and r.rating <> 0) avg_rating,
-                    value as sort
+                    value AS sort
                 FROM {table};
 
                 CREATE VIEW tag_browser_filtered_{table} AS SELECT
@@ -521,7 +521,7 @@ class CustomColumns(object):
                      WHERE {lt}.value={table}.id AND bl.book={lt}.book AND
                            r.id = bl.rating AND r.rating <> 0 AND
                            books_list_filter(bl.book)) avg_rating,
-                    value as sort
+                    value AS sort
                 FROM {table};
 
                 '''.format(lt=lt, table=table),
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index f3bd9dfa6f..e47f1761b4 100644
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:41+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:27+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "لا يفعل شيءً"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -292,62 +294,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "ملف التعريف هذا هو المقصود لجهاز سوني PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "ملف التعريف هذا هو المقصود لجهاز سوني PRS 900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "هذا الطور يستخدم مع Microsoft Reader"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "ملف التعريف هذا يستخدم مع كتب Mobipocket ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "ملف التعريف هذا يستخدم مع Hanlin V3 وأمثاله."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "ملف التعريف هذا يستخدم مع Hanlin V5 وأمثاله."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "ملف التعريف هذا يستخدم مع Cybook G3"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "ملف التعريف هذا يستخدم مع Cybook Opus ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "ملف التعريف هذا يستخدم مع Amazon Kindle ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "ملف التعريف هذا يستخدم مع Irex Illiad ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "ملف التعريف هذا يستخدم مع IRex Digital Reader 1000 ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "ملف التعريف هذا يستخدم مع B&N Nook ."
 
@@ -373,15 +375,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "ملف التعريف هذا يستخدم مع سوني PRS-300 ."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "ملف التعريف هذا يستخدم مع الخمسة بوصة JetBook ."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -389,7 +391,7 @@ msgstr ""
 "ملف التعريف هذا يستخدم مع سوني خط إنتاج PRS . الـ500/505/700 الخ ، في وضع "
 "أفقي.غالباً مفيد للكاريكاتيرات."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "ملف التعريف هذا يستخدم مع Amazon Kindle DX"
 
@@ -409,15 +411,19 @@ msgstr "تخصيص الملحقات المحلية"
 msgid "Disabled plugins"
 msgstr "ملحقات معطلة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "لا يجد ملحق صالح "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "فشل استهلال الملحق %s مع اقتفاء الأثر:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -429,29 +435,29 @@ msgstr ""
 "    المقدرة على التخصيص بتحميل الملحقات الخارجية .\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "إضافة ملحق يتخصيص مسار إلى ملف zip الذي يحتويه."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "حذف الملحق المخصص عن طريق اسمه. لا يؤثر على الملحقات المضمنة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "تخصيص الملحق . حدد اسم الملحق وسلسلة التخصيص وفرقهما بفاصلة."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "قائمة كل الملحقات المثبتة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "تمكين الملحق المسمى"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "تعطيل الملحق المسمى"
 
@@ -465,59 +471,70 @@ msgid ""
 "first one that exists will be used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "الأخبار"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -540,6 +557,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى EB600 ."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -552,6 +573,10 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى ESlick ."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -566,14 +591,20 @@ msgstr "واجهة الجهاز"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V3 ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V5 ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى BOOX ."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanvon N520 ."
@@ -600,7 +631,7 @@ msgstr "التواصل مع القارئ الكتاب الاليكترونى IRe
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -620,15 +651,15 @@ msgstr "التواصل مع القارئ الكتاب الاليكترونى Iri
 msgid "Communicate with the JetBook eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى JetBook ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle 2 ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle DX ."
 
@@ -672,7 +703,7 @@ msgstr "التواصل مع قارئ الكتاب الاليكتروني سون
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -680,7 +711,7 @@ msgstr ""
 "ضع علامة الفاصلة للفصل بين مجموعة من البيانات الوصفية لكي تكون مجموعة في "
 "الجهاز . و تشمل الاحتمالات التالية: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -701,61 +732,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "لم يتمكن من كشف القرص %s. حاول إعادة التشغيل."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "غير قادر على الكشف عن %s نقطة التحميل. حاول إعادة التشغيل."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "%s غير قادر على اكتشاف عن الذاكرة"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "غير قادر على جلب المساعد : %s ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "لا يوجد بطاقات تخزين في القارئ ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "الفتحة المختارة : %s ليست مدعومة ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "لا توجد مساحة كافية في الذاكرة الرئيسية"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "لا توجد مساحة كافية في بطاقة التخزين"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "الأخبار"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr ""
@@ -765,57 +785,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "الاتصال مع جهاز قارئ إلكتروني ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "يجري إحصاء معلومات الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "يجري إحصاء قائمة كتب من الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "يجري تحويل الكتب إلى الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "إضافة كتب لقائمة للبيانات الوصفية للجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "يجري حذف الكتب من الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "يجري إرسال دليل المعلومات. إلى الجهاز..."
 
@@ -1427,15 +1451,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1754,84 +1778,88 @@ msgstr "ضم أسرة الخطوط أحادية القياس"
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "العنوان"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "المؤلف أو المؤلفون"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "الناشر"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "المنتج"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "التعليقات"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "السلسلة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "اللغة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "ختم التوقيت"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr ""
 
@@ -1839,7 +1867,7 @@ msgstr ""
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1938,6 +1966,10 @@ msgstr "تم حفظ الغلاف في"
 msgid "No cover found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1976,6 +2008,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2032,7 +2068,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "الغلاف"
@@ -2316,6 +2352,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2521,8 +2559,8 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "ترتيب الوسوم حسب الشهرة"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2598,23 +2636,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "كتب"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "كتب EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "كتب LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "كتب HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "كتب LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "كتب MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "كتب نصّية"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "كتب PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "الرسومات"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "أرشيفات"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr "الكتب المختارة <b>سوف تحذف تماماً</b> من حاسوبك. هل أنت متأكّد؟"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "خطأ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "لا يمكن تحرير الميتاداتا"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "إختيار دليل الوجهة"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "لا يمكن تحويله"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "يتم البحث في"
@@ -2636,15 +3067,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
@@ -2763,17 +3189,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2792,17 +3218,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2824,6 +3250,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "المسار"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "التهيئات"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "بدون"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2883,7 +3361,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2901,8 +3379,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3584,11 +4062,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3669,12 +4142,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3882,11 +4355,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3907,278 +4388,290 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "احصل على معلومات الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "احصل على قائمة الكتب على الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "ارسل الميتاداتا إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "رفع %d كتاب إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "حذف كتب من الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "تنزيل الكتب من الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "عرض كتاب على الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "خطأ في الاتصال بالجهاز"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "الجهاز: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " تم كشفه."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "متصل "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "المسار"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "التهيئات"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4324,165 +4817,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "خطأ"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "مسار الملحق غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s ليس مسار لملحق صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "إختيار الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "لا يمكن تعطيل الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "الملحق: %s لا يمكن تعطيله"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "لا يمكن تخصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "الملحق: %s لا يحتاج التخصيص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "لم يمكن حذف الملحق المضمن"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " لا يمكن حذفه. هذا ملحق مضمن في البرنامج. حاول تعطيله بدلاً من حذفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "هل أنت متأكّد؟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "سجل الأخطاء:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "سجل النفاذ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "فشل في تشغيل خادم المحتوى"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "حجم غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>يجب أن يكون دليل."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4593,279 +5086,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " ثانية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "إختر ال&لغة (يحتاج إعادة تشغيل):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "عادي"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "مرتفع"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "منخفض"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "إرسال الأخبار& التي تم تنزيلها آلياً إلى قارئ الكتب الإلكترونية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "كبير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "متوسط"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "صغير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&حجم الأزرار على شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "إظهار النص& على أزرار شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "استخدم المستعرض& الداخلي في:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&اسم المستخدم:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&كلمة السرّ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "إظهار& كلمة السرّ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4876,33 +5378,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "ت&خصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&حذف الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "إضافة ملحق جديد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&ملف الملحق:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&إضافة"
 
@@ -4939,10 +5441,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "تاريخ"
 
@@ -4958,68 +5461,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5128,6 +5632,27 @@ msgstr ""
 msgid "ERROR"
 msgstr "خطأ"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "التهيئة"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "ترتيب المؤلف"
@@ -5334,11 +5859,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "كتب"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5377,67 +5897,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5795,12 +6323,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "المؤلفون"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "الناشرون"
 
@@ -5917,12 +6445,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "إضافة وسم إلى قائمة الوسوم المتوفرة وعلّم الكتاب الحالي به"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5954,25 +6482,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6214,11 +6742,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6254,54 +6782,203 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "تحرير الميتاداتا فردياً"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "تحرير الميتاداتا جملةً"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "إضافة كتب من دليل واحد"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "حفظ إلى القرص"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "حفظ إلى القرص في دليل واحد"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "عرض"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "عرض تهيئة معينة"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "الحالة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "غير متوفر"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6313,112 +6990,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "بدون"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "كتاب <font face=\"serif\">%s</font> لـ%s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "التهيئة"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6514,282 +7169,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "بحث متقدّم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&بحث:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "ترتيب حسب الش&هرة"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "إضافة كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "حذف كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "تحرير معلومات الميتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "إرسال لجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "حفظ إلى القرص"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "احصل على الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "تحويل الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "عرض"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "كتب بنفس الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6819,15 +7445,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "بحث"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6888,82 +7534,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7005,619 +7644,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "تبرع& لدعم كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "إعادة تشغيل&"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "تحرير الميتاداتا فردياً"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "تحرير الميتاداتا جملةً"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "إضافة كتب من دليل واحد"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "حفظ إلى القرص في دليل واحد"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "عرض تهيئة معينة"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "الجهاز: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " تم كشفه."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "متصل "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "كتب EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "كتب LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "كتب HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "كتب LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "كتب MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "كتب نصّية"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "كتب PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "الرسومات"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "أرشيفات"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr "الكتب المختارة <b>سوف تحذف تماماً</b> من حاسوبك. هل أنت متأكّد؟"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "لا يمكن تحرير الميتاداتا"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "إختيار دليل الوجهة"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "لا يمكن تحويله"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "خطأ في الاتصال بالجهاز"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "تحديث متوفر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8084,82 +8216,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8420,48 +8564,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8842,7 +8986,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8923,43 +9067,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9145,43 +9293,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9324,34 +9472,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9408,97 +9560,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "تم التنزيل"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "فشل تنزيل المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "فشل تنزيل أجزاء من المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " من "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "محاولة تنزيل الغلاف..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "تم تنزيل التلقيم إلى %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "لم يتمكّن من تنزيل الغلاف: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "يتم تنزيل الغلاف من %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "مقالة بدون عنوان"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "المقالة منزّلة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "فشل تنزيل المقالة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9519,55 +9671,55 @@ msgstr "تم جدولته"
 msgid "Custom"
 msgstr "مخصّص"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9576,7 +9728,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -10014,6 +10166,9 @@ msgstr ""
 #~ msgstr ""
 #~ "حين يوجد، استخدم معلومات ترتيب المؤلف لإنشاء ميتاداتا المؤلف في Mobipocket."
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "ترتيب حسب الش&هرة"
+
 #~ msgid "Automatic &Table of Contents"
 #~ msgstr "قائمة المحتويات& المنشئة آلياً"
 
@@ -10048,6 +10203,9 @@ msgstr ""
 #~ msgid "A comma separated list of tags to set"
 #~ msgstr "ضبط قائمة من الوسوم المفرقة بفاصلة"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "ترتيب الوسوم حسب الشهرة"
+
 #~ msgid "Remove &first image from source file"
 #~ msgstr "حذف الصورة الأو&لى من ملف المصدر"
 
diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index 98f48ea46d..f0f08e4c2c 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-21 22:47+0000\n"
-"PO-Revision-Date: 2010-05-21 07:29+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:06+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -26,13 +26,12 @@ msgstr "No fa absolutament res"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:204
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -44,21 +43,22 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:912
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -74,9 +74,9 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:980
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:908
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:913
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:979
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -100,47 +100,50 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:87
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:583
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:441
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1697
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:311
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:248
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:260
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:680
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:717
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1113
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1235
-#: /home/kovid/work/calibre/src/calibre/library/server.py:671
-#: /home/kovid/work/calibre/src/calibre/library/server.py:747
-#: /home/kovid/work/calibre/src/calibre/library/server.py:794
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
+#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -161,13 +164,13 @@ msgstr "Tipus de fitxer"
 msgid "Metadata reader"
 msgstr "Lector de metadades"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Escriptor de metadades"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
-msgstr ""
+msgstr "Generador del Catàleg"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
 msgid ""
@@ -285,7 +288,7 @@ msgstr ""
 "sabeu res del document d'entrada."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:266
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr ""
@@ -297,62 +300,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Aquest perfil és adient per al SONY PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Aquest perfil és adient per al SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Aquest perfil és adient per al Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Aquest perfil és adient per a llibres Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Aquest perfil és adient per al Hanlin V3 i els seus clons."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Aquest perfil és adient per al Hanlin V5 i els seus clons."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Aquest perfil és adient per al Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Aquest perfil és adient per al Cybook Opus"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Aquest perfil és adient per a l'Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Aquest perfil és adient per a l'Irex Illiad"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Aquest perfil és adient per al IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Aquest perfil és adient per al IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Aquest perfil és adient per al B&N Nook."
 
@@ -370,24 +373,25 @@ msgstr ""
 "si voleu generar un document que es pugui llegir en un PC o en un conjunt "
 "ampli de dispositius diferents."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:248
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr ""
+"Destinats als dispositius d'IPAD i similars amb una resolució de 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:271
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Aquest perfil és adient per al lector Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Aquest perfil és adient per al SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Aquest perfil és adient per al 5-inch JetBook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -395,7 +399,7 @@ msgstr ""
 "Aquest perfil és adient per al la línia PRS de SONY. Els models 500/505/700, "
 "etc., en mode apaïsat. Sobretot és útil per als còmics."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Aquest perfil és adient per a l'Amazon Kindle DX."
 
@@ -415,15 +419,19 @@ msgstr "Personalització del connector local"
 msgid "Disabled plugins"
 msgstr "Connectors inhabilitats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "No s'ha trobat cap connector vàlid a "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "No s'ha pogut inicialitzar el connector %s i s'ha generat la traça:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -435,18 +443,18 @@ msgstr ""
 "    Personalitzeu el calibre carregant connectors externs.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Afegeix un connector especificiant el camí al fitxer ZIP que el conté"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Suprimeix un connector personalitzat per nom. No té cap efecte als "
 "complements integrats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -454,15 +462,15 @@ msgstr ""
 "Personalitza el connector. Especifiqueu el nom del connector i el text que "
 "desitgeu, separats per una coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Fes una llista amb tots els connectors instal·lats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Habilita el connector anomenat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Inhabilita el connector anomenat"
 
@@ -479,10 +487,75 @@ msgstr ""
 "dispositiu. S'usarà el primer directori del llistat que ja existeixi al "
 "dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Estableix comunicació amb els telèfons S60."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
+msgid "Communicate with iBooks through iTunes."
+msgstr "Comunicar-se amb els iBooks a través d'iTunes"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr "Dispositiu Apple detectat, engegant iTunes, esperi si us plau ..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
+msgid "Updating device metadata listing..."
+msgstr "Actualitzant la llista de metadades del dispositiu..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
+msgid "%d of %d"
+msgstr "%d de %d"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
+msgid "finished"
+msgstr "finalitzat"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
+msgid ""
+"Some books not found in iTunes database.\n"
+"Delete using the iBooks app.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+"Alguns llibres no s'han trobat a la base de dades de l'iTunes.\n"
+"Elimina'ls utilitzant l'aplicació de l'iBooks.\n"
+"Clic a 'Veure Detalls' per a més informació."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
+msgid "settings for device drivers"
+msgstr "paràmetres dels controladors de dispostius"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+msgid "Ordered list of formats the device will accept"
+msgstr "Llistat ordenat de formats que el dispositiu accepta"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+"Varies portades no s'han pogut convertir.\n"
+"Clic a 'Veure Detalls' per a més informació."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Notícies"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -508,6 +581,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics EB600"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -521,35 +598,59 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics ESlick."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Comunicar amb el Sigmatek eBook reader."
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr "Utilitzar un directori arbitrari per al dispositiu."
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
+#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
+msgid "Device Interface"
+msgstr "Interfície del dispostiu"
+
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:95
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:114
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Hanvon N520."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
+msgid "Communicate with The Book reader."
+msgstr "Comunicar-se amb el lector de llibres electrònics."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics SpringDesign Alex."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
 msgid "Communicate with the Azbooka"
-msgstr ""
+msgstr "Comunicar-se amb Azbooka"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
 msgid "Communicate with the Elonex EB 511 eBook reader."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Elonex EB 511."
@@ -561,14 +662,10 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
-#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
-msgid "Device Interface"
-msgstr "Interfície del dispostiu"
-
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
 msgstr ""
@@ -590,29 +687,29 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics Kindle"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics Kindle 2"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics Kindle DX"
 
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
+msgid "Communicate with the Kobo Reader"
+msgstr "Comunica amb el lector Kobo Reader"
+
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Comunica amb el Palm Pre"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
-msgid "Communicate with the Kobo Reader"
-msgstr "Comunica amb el lector Kobo Reader"
-
-#: /home/kovid/work/calibre/src/calibre/devices/misc.py:56
 msgid "Communicate with the Booq Avant"
-msgstr ""
+msgstr "Comunicar-se amb Booq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -639,27 +736,11 @@ msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Sony PRS-500."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
-msgstr "S'està obtenint el llistat de llibres disponibles al dispositiu..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
+msgid "Communicate with all the Sony eBook readers."
+msgstr "Comunicar-se amb tots els lectors de llibres electrònics de Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr ""
-"Estableix comunicació amb el lector de llibres electrònics Sony PRS-"
-"300/505/500."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -667,30 +748,10 @@ msgstr ""
 "Llistat on apareixen, separats per coma, els camps de metadades per "
 "traslladar a les col·leccions del dispositiu. Les possibilitats inclouen: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "S'estan transferint llibres al dispositiu..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "S'estan suprimint  els llibres del dispositiu..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "S'estan enviant metadades al dispositiu..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr ""
-"Estableix comunicació amb el lector de llibres electrònics Sony PRS-"
-"600/700/900."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Sense nom"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
@@ -702,31 +763,31 @@ msgid "Communicate with the Teclast K3 reader."
 msgstr ""
 "Estableix comunicació amb el lector de llibres electrònics Teclast K3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:45
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
-msgstr ""
+msgstr "Comunicar-se amb el lector Newsmy."
 
-#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
-msgstr ""
+msgstr "Comunicar-se amb el lector iPapyrus."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:252
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "No s'ha pogut detectar la unitat de disc %s. Proveu a reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:425
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "No s'ha pogut detectar el punt de muntatge %s. Proveu a reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:490
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "No s'ha pogut detectar la unitat de disc %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:583
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "No s'ha pogut trobar l'assistent de muntatge: %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:595
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -734,86 +795,95 @@ msgstr ""
 "No s'ha pogut detectar la unitat de disc %s. El kernel probablement utilitza "
 "una versió obsoleta de SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:603
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "No s'ha pogut muntar la memòria principal (Codi d'error: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:740
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "El lector no té cap targeta de memòria en aquesta ranura."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Ranura seleccionada: %s no és compatible."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "No hi ha espai lliure suficient a la memòria principal"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "No hi ha espai lliure suficient a la targeta de memòria"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:811
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:842
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:589
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:995
-msgid "News"
-msgstr "Notícies"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Configura el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "paràmetres dels controladors de dispostius"
-
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr "Llistat ordenat de formats que el dispositiu accepta"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
 msgid "Place files in sub directories if the device supports them"
 msgstr "Posa els fitxers a subdirectoris si el dispostiu ho permet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Llegeix les metadades dels fitxers del dispositiu"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Planilla per a controlar quants llibres s'han desat"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Personalització addicional"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Obté informació del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+msgid "Getting list of books on device..."
+msgstr "S'està obtenint el llistat de llibres disponibles al dispositiu..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+msgid "Transferring books to device..."
+msgstr "S'estan transferint llibres al dispositiu..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "S'estan afegint llibres al llistat de metadades del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
+msgid "Removing books from device..."
+msgstr "S'estan suprimint  els llibres del dispositiu..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "S'estan suprimint llibres del llistat de metadades del dispositiu..."
 
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
+msgid "Sending metadata to device..."
+msgstr "S'estan enviant metadades al dispositiu..."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [opcions] mybook.chm"
@@ -1480,6 +1550,12 @@ msgid ""
 "corresponding pair of normal characters. This option will preserve them "
 "instead."
 msgstr ""
+"Preservar les lligadures presents en el document d'entrada. Una lligadura es "
+"un render especial de parells de caràcters tipus ff, fi, fl etc. Molts "
+"lectors, a les seves fonts per defecte, no ten suport per a dites "
+"lligadures, pel qual és poc probable que les renderitze correctament. Per "
+"defecte, calibre canviarà la lligadura per el seu parell de caràcters "
+"normals corresponents. Aquesta opció serà conservada en el seu lloc."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
@@ -1502,7 +1578,7 @@ msgstr "Text que s'usarà en l'ordenació per autor. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
-msgstr ""
+msgstr "Col·locar la portada des del fitxer especificat o URL"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
@@ -1522,7 +1598,7 @@ msgstr "Establiu la sèria a la que pertany el llibre electrònic."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
-msgstr ""
+msgstr "Col·locar l'index del llibre a aquesta serie."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
@@ -1538,6 +1614,7 @@ msgstr "Establiu el codi ISBN del llibre."
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
 msgid "Set the tags for the book. Should be a comma separated list."
 msgstr ""
+"Col·locar les etiquetes al llibre. Ha de ser una llista separada per comes."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
@@ -1551,43 +1628,49 @@ msgstr "Establiu la llengua."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
-msgstr ""
+msgstr "Col·locar la data de publicació."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr ""
+"Col·locar la data i l'hora al llibre (utilitzat per la columna data al "
+"calibre)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
-msgstr ""
+msgstr "No s'ha pogut trobar cap llibre electrònic dins de l'arxiu"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr ""
+"Els valors de l'índex de la serie i la seva puntuació han de ser números. "
+"Ignorant"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
-msgstr ""
+msgstr "No s'ha pogut analitzar la data/hora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "S'està convertint l'entrada a HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "S'estàn transformant el llibre electrònic..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "S'està creant"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
 "The contents of the directory are first deleted, so be careful."
 msgstr ""
+"Extregui el contingut del fitxer generat EPUB al directori especificat. Els "
+"continguts del directori s'esborraran en primer lloc, tingui compte."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:211
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
 "Turn off splitting at page breaks. Normally, input files are automatically "
 "split at every page break into two files. This gives an output ebook that "
@@ -1595,30 +1678,47 @@ msgid ""
 "if your source file contains a very large number of page breaks, you should "
 "turn off splitting on page breaks."
 msgstr ""
+"Desactivi les divisions als salts de línia. Normalment, els fitxers "
+"d'entrada es divideixen en dos automàticament a cada salt de pàgina. Això li "
+"dóna un llibre electrònic (e-book) de sortida que es pot analitzar més ràpid "
+"i amb menys recursos. Si més no, la divisió és lenta i si el seu fitxer "
+"d'origen conté un gran número de salts de pàgina, vostè ha de desactivar la "
+"divisió dels salts de pàgina."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:222
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
 "Split all HTML files larger than this size (in KB). This is necessary as "
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
+"Divideix tots els fitxers HTML majors d'aquesta mida (en KB). Això es "
+"necessari perquè la majoria de lectors EPUB no poden manegar els fitxers de "
+"gran mida. El valor predeterminat de %defaultKB es la mida requerida per "
+"Adobe Digital Editions."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
 "Normally, if the input file has no cover and you don't specify one, a "
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
+"Normalment, si el fitxer d'entrada no te tapa i no s'especifica una, es "
+"genera una tapa per defecte amb el títol, autors, etc. Aquesta opció "
+"deshabilita la generació d'aquesta tapa."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
 "Do not use SVG for the book cover. Use this option if your EPUB is going to "
 "be used ona  device that does not support SVG, like the iPhone or the "
 "JetBook Lite. Without this option, such devices will display the cover as a "
 "blank page."
 msgstr ""
+"No utilitzi SVG per a la tapa del llibre. Utilitzi aquesta opció si el seu "
+"EPUB s'utilitzarà a un dispositiu que no es compatible amb SVG, com l'iPhone "
+"o el jetBook Lite. Sense aquesta opció, dits dispositius mostraran la tapa "
+"com una pàgina en blanc."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:243
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
 msgid ""
 "When using an SVG cover, this option will cause the cover to scale to cover "
 "the available screen area, but still preserve its aspect ratio (ratio of "
@@ -1626,6 +1726,16 @@ msgid ""
 "and bottom of the image, but the image will never be distorted. Without this "
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
+"Quan s'utilitza una tapa SVG, aquesta opció farà que s'escali la tapa per "
+"cobrir l'àrea de pantalla disponible, però encara conservarà la seva relació "
+"d'aspecte (relació entre l'amplada i l'altura). Això significa que pot haver "
+"cantons blancs als costats o a la part superior i inferior de la imatge, "
+"però la imatge mai es distorsiona. Sense aquesta opció, la imatge pot estar "
+"una mica distorsionada, però no hi haurà fronteres."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
+msgid "Start"
+msgstr "Inici"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
@@ -1650,6 +1760,8 @@ msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first."
 msgstr ""
+"Travessia d'enllaços en fitxers  HTML primerament per extensió. Normalment, "
+"són primerament travessats per profunditat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:250
 msgid ""
@@ -1657,6 +1769,9 @@ msgid ""
 "negative. 0 implies that no links in the root HTML file are followed. "
 "Default is %default."
 msgstr ""
+"Els nivells màxims de recursivitat quan es segueixen els enllaços als "
+"fitxers HTML. No han de ser negatius. 0 significa que no hi ha enllaços a "
+"l'arrel del fitxer HTML per seguir. El valor predeterminat es %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:259
 msgid ""
@@ -1703,7 +1818,7 @@ msgstr "\tS'està convertint a BBeB..."
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552
 msgid "Could not parse file: %s"
-msgstr ""
+msgstr "No s'ha pogut analitzar el fitxer: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
@@ -1711,11 +1826,11 @@ msgstr "%s és un fitxer buit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "Ha fallat l'anàlisi de l'enllaç %s %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "No s'ha pogut afegir l'enllaç %s a la TDC"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
@@ -1896,80 +2011,88 @@ msgstr "Famí­lia de lletres monoespaiades per a incrustar."
 msgid "Comic"
 msgstr "Còmic"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:363
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:416
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tí­tol"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:421
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:365
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Editorial"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Productor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:367
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:95
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Comentaris"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:96
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Sèries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Llengua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Marca de temps"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publicat"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Drets"
 
@@ -1977,7 +2100,7 @@ msgstr "Drets"
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2076,44 +2199,52 @@ msgstr "Portada desada a"
 msgid "No cover found"
 msgstr "No s'ha trobat cap caràtula"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Metadades baixades"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:136
 msgid "Downloads metadata from Google Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:152
 msgid "Downloads metadata from isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:181
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:180
 msgid ""
 "To use isbndb.com you must sign up for a %sfree account%s and enter your "
 "access key below."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:189
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:188
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2170,8 +2301,8 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1103
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
 
@@ -2210,74 +2341,74 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
@@ -2294,10 +2425,6 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
@@ -2321,7 +2448,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2329,7 +2456,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2458,6 +2585,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2535,28 +2664,34 @@ msgstr ""
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31
 msgid ""
 "The unit of measure. Default is inch. Choices are %s Note: This does not "
 "override the unit for margins!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36
 msgid ""
 "The size of the paper. This size will be overridden when an output profile "
 "is used. Default is letter. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:68
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40
 msgid ""
 "Custom size of the document. Use the form widthxheight EG. `123x321` to "
 "specify the width and height. This overrides any specified paper-size."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
+msgid ""
+"Preserve the aspect ratio of the cover, instead of stretching it to fill the "
+"ull first page of the generated pdf."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr ""
@@ -2585,13 +2720,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+msgid ""
+"Normally extra spaces are condensed into a single space. With this option "
+"all spaces will be displayed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2622,191 +2763,778 @@ msgid ""
 "allows max-line-length to be below the minimum"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
-msgid "Sort tags list by popularity"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Number of covers to show in the cover browsing mode"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
-msgid "Defaults for conversion to LRF"
+msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+msgid "tag browser categories not to display"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Cap llibre seleccionat"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Cap llibre seleccionat"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "No puc editar les meta-dades"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "No puc desar al disc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "No puc convertir-lo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "No puc mostrar-lo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 msgid "The specified directory could not be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1822
-msgid "No books found"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:341
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:354
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
+msgid "Searching for sub-folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
+msgid "Searching for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
+msgid "Looking for duplicates based on file hash"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
+msgid "Choose root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
+msgid "Invalid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
+msgid "is not a valid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
+msgid "Add books to calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
+msgid "WizardPage"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
+msgid "Scanning root folder for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
+msgid "This may take a few minutes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
+msgid "Choose the location to add books from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
+msgid "Select a folder on your hard disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
+msgid ""
+"<p>calibre can scan your computer for existing books automatically. These "
+"books will then be <b>copied</b> into the calibre library. This wizard will "
+"help you customize the scanning and import process for your existing book "
+"collection.</p>\n"
+"<p>Choose a root folder. Books will be searched for only inside this folder "
+"and any sub-folders.</p>\n"
+"<p>Make sure that the folder you chose for your calibre library <b>is "
+"not</b> under the root folder you choose.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
+msgid "&Root folder:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
+msgid ""
+"This folder and its sub-folders will be scanned for books to import into "
+"calibre's library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
+msgid "..."
+msgstr "..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:67
+msgid "Handle multiple files per book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
+msgid ""
+"&One book per folder, assumes every ebook file in a folder is the same book "
+"in a different format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
+msgid ""
+"&Multiple books per folder, assumes every ebook file is a different book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Camí"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formats"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Cap"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2858,15 +3586,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2883,9 +3611,9 @@ msgid "E-book options"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:282
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:958
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:976
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3050,46 +3778,6 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 msgid ""
 "The debug process outputs the intermediate HTML generated at various stages "
@@ -3361,38 +4049,38 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:101
 msgid "Choose cover for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:108
 msgid "Cannot read"
 msgstr "No pot llegir-se"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109
 msgid "You do not have permission to read the file: "
 msgstr "No tens permissos per a llegir l'arxiu: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Error llegint de l'arxiu: <br /><b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126
 msgid " is not a valid picture"
 msgstr " no és una imatge vàlida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
 msgid "Book Cover"
 msgstr "Coberta"
 
@@ -3401,28 +4089,28 @@ msgid "Use cover from &source file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
 msgid "Change &cover image:"
 msgstr "Canvia la imatge de la &coberta:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Cerca una imatge per a utilitzar com a coberta d'aquest llibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 msgid "&Title: "
 msgstr "&Tí­tol: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
 msgid "Change the title of this book"
 msgstr "Canvia el tí­tol del llibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "&Author(s): "
 msgstr "&Autor(s): "
 
@@ -3438,19 +4126,19 @@ msgstr ""
 "Canvia l'autor(s). Per a especificar més d'un, separeu-los amb comes."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
 msgid "&Publisher: "
 msgstr "&Editorial: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "Ta&gs: "
 msgstr "Etique&tes: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
@@ -3459,22 +4147,22 @@ msgstr ""
 "<br><br>Pot emprar-se qualsevol paraula o frase, separada per comes."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
 msgid "&Series:"
 msgstr "&Sèries:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "List of known series. You can add new series."
 msgstr "Llistat de sèries conegudes. Podeu afegir-hi de noves."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
 msgid "Book "
 msgstr "Llibre "
 
@@ -3559,12 +4247,12 @@ msgid "PDB Input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 msgid "Treat each &line as a paragraph"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Assume print formatting"
 msgstr ""
 
@@ -3592,32 +4280,31 @@ msgstr ""
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
+msgid "Preserve &aspect ratio of cover"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2067
-msgid "Choose the format to view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "No formats available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
@@ -3689,12 +4376,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3778,21 +4465,25 @@ msgstr ""
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Process using markdown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
 msgid ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
 msgid "Do not insert Table of Contents into output text when using markdown"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
+msgid "Preserve &spaces"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
 msgstr ""
@@ -3898,246 +4589,325 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242
+msgid "Undefined"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
+msgid "Yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
+msgid "No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:331
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:333
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Envia a la memòria interna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:350
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
+msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Error en la comunicació amb el dispositiu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Error comunicant amb el dispositiu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Hi ha hagut un error de comunicació amb el dispositiu. Lleve, torne a "
+"connectar el dispositiu i torne a iniciar el programa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:585
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:629
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:636
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:789
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Sense espai al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>No puc desar llibres al dispositiu perquè no hi ha espai restant "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:93
-msgid "Path"
-msgstr "Camí"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Formats"
-msgstr "Formats"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4185,11 +4955,11 @@ msgstr ""
 msgid "Choose Format"
 msgstr "Trieu format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
 msgstr ""
 
@@ -4205,210 +4975,241 @@ msgstr ""
 msgid "&Profile:"
 msgstr "&Perfil:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
+msgid "Edit Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:173
 msgid "%(plugin_type)s %(plugins)s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:224
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:222
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
 msgid "new email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
-"port. You operating system <b>may</b> not allow the server to run on this "
+"port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+msgid "Do you really want to delete column %s and all its data?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Ubicació de la base de dades no vàlida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Ubicació de la base de dades no vàlida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Cal que siga un directori."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ubicació de la base de dades no vàlida.<br>No es pot escriure "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
+msgid ""
+"The changes you made require that Calibre be restarted. Please restart as "
+"soon as practical."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4519,259 +5320,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Cerca la nova ubicació de la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+msgid "Show &splash screen at startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nom d'&usuari:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Contrasenya:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+msgid "Max. OPDS &ungrouped items:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4782,33 +5612,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4836,16 +5666,6 @@ msgstr ""
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
@@ -4855,8 +5675,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
 
@@ -4872,6 +5695,128 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
+msgid "Comma separated text, like tags, shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
+msgid "Long text, like comments, not shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
+msgid ""
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
+msgid ""
+"The lookup name must be lower case and cannot contain \":\"s or spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:117
+msgid "Create or edit custom columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
+msgid "&Lookup name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
+msgid "Column &heading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:104
+msgid ""
+"Used for searching the column. Must contain only digits and lower case "
+"letters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
+msgid ""
+"Column heading in the library view and category name in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
+msgid "Column &type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
+msgid "What kind of information will be kept in the column."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
+msgid ""
+"<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's "
+"for year.</p>\n"
+"<p>For example:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy gives 05 January 10</li>\n"
+"</ul> "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
+msgid "Use MMM yyyy for month + year, yyyy for year only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
+msgid "Default: dd MMM yyyy."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
+msgid "Format for &dates"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
 msgstr ""
@@ -4913,10 +5858,6 @@ msgstr ""
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
@@ -4925,6 +5866,27 @@ msgstr ""
 msgid "ERROR"
 msgstr "ERROR"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5019,29 +5981,24 @@ msgstr ""
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:22
-msgid "Editing meta information for %d books"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:24
+msgid "Editing meta information for <b>%d books</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "Editar Meta-informació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "Meta-informació"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
@@ -5049,55 +6006,55 @@ msgstr ""
 "Especifiqueu com s'ha d'ordenar l'autor(s) d'aquest llibre. Per "
 "exemple,ordena Vicent A. Estellés com a Estellés, Vicent A."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
 msgid "&Rating:"
 msgstr "&Valoració:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
 msgid "Rating of this book. 0-5 stars"
 msgstr "Valora aquest llibre: 0-5 estreles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
 msgid " stars"
 msgstr " estreles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
 msgid ""
 "Selected books will be automatically numbered,\n"
 "in the order you selected them.\n"
@@ -5105,196 +6062,224 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
+msgid ""
+"Remove stored conversion settings for the selected books.\n"
+"\n"
+"Future conversion of these books will use the default settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
+msgid "Remove &stored conversion settings for the selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412
+msgid "&Basic metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
+msgid "&Custom metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
 msgid "Not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1284
-msgid "Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:168
 msgid "You do not have permission to read the following files:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:207
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:208
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:257
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "No puc aconseguir la coberta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No puc aconseguir la coberta.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Edit Meta Information"
 msgstr "Edita la meta-informació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+msgid "Meta information"
+msgstr "Meta-informació"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 msgid "Author S&ort: "
 msgstr "&Ordena autors: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
 msgid "IS&BN:"
 msgstr "IS&BN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
 msgid "Publishe&d:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "dd MMM yyyy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
 msgid "&Date:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
 msgid "&Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
 msgid "&Fetch metadata from server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
 msgid "Available Formats"
 msgstr "Formats disponibles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
 msgid "Add a new format for this book to the database"
 msgstr "Afegir un nou format per a aquest llibre a la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
 msgid "Remove the selected formats for this book from the database."
 msgstr ""
 "Elimina els formats seleccionats per a aquest llibre de la base de dades."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Set the cover for the book from the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
 msgid "Update metadata from the metadata in the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
 msgid "Reset cover to default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411
 msgid "Download &cover"
 msgstr ""
 
@@ -5306,48 +6291,81 @@ msgstr "Es necessita una contrasenya."
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54
+msgid ""
+"The current saved search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
 msgid "You must provide a username and/or password to use this news source."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
 msgid "Download all scheduled new sources"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
 msgstr ""
 
@@ -5540,11 +6558,79 @@ msgstr ""
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
+msgid " (not on any book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
+msgid ""
+"The current tag category will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
+msgid "User Categories Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
+msgid "A&vailable items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
+msgid "Apply tags to current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
+msgid "A&pplied items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
+msgid "Unapply (remove) tag from current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
+msgid "Category name: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
+msgid "Select a category to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
+msgid "Delete this selected tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
+msgid "Enter a new category name. Select the kind before adding it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
+msgid "Add the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
+msgid "Category filter: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
+msgid "Select the content kind of the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:93
 msgid "Are your sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
 msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
@@ -5590,6 +6676,66 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
+msgid "Item is blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
+msgid "Item already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
+msgid "The item %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
+msgid "No item selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
+msgid "You must select one item from the list of Available items."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
+msgid "No items selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
+msgid "You must select at least one items from the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
+msgid "Are you certain you want to delete the following items?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Category Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+msgid "Rename the item in every book where it is used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr ""
@@ -5828,11 +6974,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -5868,98 +7014,303 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Edita metadades individualment"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Edita metadades en massa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Desa al disc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Mostra"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Converteix individualment"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Converteix tots"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Treball"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Estat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progressió"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Treballs:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1161
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "N"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "Y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Grandària (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Valoració"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:440
-msgid "None"
-msgstr "Cap"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Llibre <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
+msgid "Size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "Configura el visor"
@@ -6034,273 +7385,269 @@ msgstr "Obre l'eBook"
 msgid "Configure"
 msgstr "Configura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:74
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "Re&cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Reinicialitza la recerca ràpida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:382
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:383
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:384
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Afegeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Suprimeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Esborra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Edita la meta-informació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
-msgid "Merge books"
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Envia al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
-msgid "Save to disk"
-msgstr "Desa al disc"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Recull notí­cies (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Converteix Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-msgid "View"
-msgstr "Mostra"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6330,11 +7677,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6395,44 +7766,77 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
-msgid "Jobs:"
-msgstr "Treballs:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:163
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
+msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:206
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
+msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
+msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
+msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -6472,594 +7876,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:67
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:148
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:154
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:177
-msgid "Error communicating with device"
-msgstr "Error en la comunicació amb el dispositiu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:273
-msgid "Edit metadata individually"
-msgstr "Edita metadades individualment"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:275
-msgid "Edit metadata in bulk"
-msgstr "Edita metadades en massa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:277
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:278
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:279
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:280
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:284
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:293
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:297
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:300
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2172
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:358
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:365
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:367
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:406
-msgid "Convert individually"
-msgstr "Converteix individualment"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:407
-msgid "Bulk convert"
-msgstr "Converteix tots"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:410
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:462
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:745
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:901
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:903
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:931
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:943
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:944
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1180
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1181
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1917
-msgid "No books selected"
-msgstr "Cap llibre seleccionat"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1012
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1071
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1090
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1099
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1104
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1224
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1225
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1324
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1289
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1290
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1291
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1292
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1293
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1294
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1298
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1333
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1364
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2077
-msgid "No book selected"
-msgstr "Cap llibre seleccionat"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1377
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1460
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1491
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1507
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1533
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1534
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1537
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1586
-msgid "Cannot edit metadata"
-msgstr "No puc editar les meta-dades"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1611
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1626
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1638
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1733
-msgid "Cannot save to disk"
-msgstr "No puc desar al disc"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1736
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1778
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1779
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1800
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1823
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1833
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1836
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1837
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1851
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1865
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "Cannot convert"
-msgstr "No puc convertir-lo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1945
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2114
-msgid "Cannot view"
-msgstr "No puc mostrar-lo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2098
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2099
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2115
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "No puc configurar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "No puc configurar-lo amb treballs processant-se"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2257
-msgid "Error talking to device"
-msgstr "Error comunicant amb el dispositiu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2258
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Hi ha hagut un error de comunicació amb el dispositiu. Lleve, torne a "
-"connectar el dispositiu i torne a iniciar el programa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -7526,122 +8448,138 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
 "your calibre book collection directly on the device. To do this you have to "
 "turn on the content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
 msgid ""
 "Remember to leave calibre running as the server only runs as long as calibre "
 "is running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
 msgid ""
 "You have to add the URL http://myhostname:8080 as your calibre library in "
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:465
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:522
 msgid ""
 "<p>An invalid library already exists at %s, delete it before trying to move "
 "the existing library.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
@@ -7676,13 +8614,6 @@ msgstr ""
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
 msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
@@ -7865,38 +8796,49 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "empty"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
@@ -7916,14 +8858,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:262
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
 msgid ""
 "Title of generated catalog used as title in metadata.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:269
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
@@ -7932,14 +8874,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:279
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
 msgid ""
 "Regex describing tags to exclude as genres.\n"
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:285
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
 msgid ""
 "Comma-separated list of tag words indicating book should be excluded from "
 "output.  Case-insensitive.\n"
@@ -7948,28 +8890,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:293
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
 msgid ""
 "Include 'Titles' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:300
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
 msgid ""
 "Include 'Recently Added' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:307
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
 msgid ""
 "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:314
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
 "Sort titles with leading numbers as text, e.g.,\n"
 "'2001: A Space Odyssey' sorts as \n"
@@ -7978,7 +8920,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:321
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
 msgid ""
 "Specifies the output profile.  In some cases, an output profile is required "
 "to optimize the catalog for the device.  For example, 'kindle' or "
@@ -7988,27 +8930,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:328
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
 msgid ""
 "Tag indicating book has been read.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:122
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:41
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
 "List the books available in the calibre database.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:128
 msgid ""
 "The fields to display when listing books in the database. Should be a comma "
 "separated list of fields.\n"
@@ -8017,61 +8959,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:230
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:135
 msgid ""
 "The field by which to sort the results.\n"
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:234
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:139
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:236
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:237
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:238
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:342
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
 "The following books were not added as they already exist in the database "
 "(see --duplicates option):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:365
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:267
 msgid ""
 "%prog add [options] file1 file2 file3 ...\n"
 "\n"
@@ -8080,43 +9016,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:374
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:276
 msgid ""
 "Assume that each directory has only a single logical book and that all files "
 "in it are different e-book formats of that book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:380
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:382
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid "Set the title of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:384
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:286
 msgid "Set the authors of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:386
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:288
 msgid "Set the ISBN of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:411
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8125,11 +9061,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:442
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:461
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
 "%prog add_format [options] id ebook_file\n"
 "\n"
@@ -8138,15 +9074,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:476
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
 msgid "You must specify an id and an ebook file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:481
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:489
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:391
 msgid ""
 "\n"
 "%prog remove_format [options] id fmt\n"
@@ -8156,11 +9092,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:506
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:408
 msgid "You must specify an id and a format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8170,15 +9106,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:554
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
 msgid ""
 "\n"
 "%prog set_metadata [options] id /path/to/metadata.opf\n"
@@ -8191,11 +9127,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:570
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:472
 msgid "You must specify an id and a metadata file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8206,27 +9142,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:598
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid "Export all books in database, ignoring the list of ids."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:600
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
 msgid "Export books to the specified directory. Default is"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:602
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:504
 msgid "Export all books into a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:609
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:511
 msgid "Specifying this switch will turn this behavior off."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:632
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:534
 msgid "You must specify some ids or the %s option"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
 msgid ""
 "%prog add_custom_column [options] label name datatype\n"
 "\n"
@@ -8237,23 +9173,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:654
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:658
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:560
 msgid ""
 "A dictionary of options to customize how the data in this column will be "
 "interpreted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:671
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
 "\n"
 "    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n"
@@ -8264,30 +9200,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:743
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
 msgid ""
 "Comma-separated list of database IDs to catalog.\n"
 "If declared, --search is ignored.\n"
 "Default: all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:747
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:649
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search-related documentation in the User Manual.\n"
 "Default: no filtering"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:753
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:655
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:766
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:786
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:688
 msgid ""
 "\n"
 "    %prog set_custom [options] column id value\n"
@@ -8299,17 +9235,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:797
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:699
 msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:808
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:710
 msgid "Error: You must specify a field name, id and value"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8318,19 +9254,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:834
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:736
 msgid "Show details for each column."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:846
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:748
 msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:854
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:756
 msgid ""
 "\n"
 "    %prog remove_custom_column [options] label\n"
@@ -8340,15 +9276,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:862
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:764
 msgid "Do not ask for confirmation"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:872
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:774
 msgid "Error: You must specify a column label"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8360,30 +9296,50 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+msgid "Ratings"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
@@ -8506,25 +9462,106 @@ msgstr ""
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:379
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39
+msgid ""
+"The maximum number of matches to return per OPDS query. This affects Stanza, "
+"WordPlayer, etc. integration."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:888
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
 msgid "Path to the library folder to serve with the content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:890
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
 msgid "Write process PID to the specified file"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Newest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
@@ -8539,58 +9576,62 @@ msgid ""
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:650
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:652
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:656
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:658
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:660
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:662
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:682
 msgid "The default output format for ebook conversions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:666
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:686
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:668
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
 msgid "The priority of worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:692
 msgid "Swap author first and last names when reading metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:700
+msgid "User-created tag browser categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
 msgstr ""
@@ -8660,34 +9701,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -8711,13 +9756,13 @@ msgstr ""
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
 msgid "Untitled article"
 msgstr ""
 
@@ -8744,97 +9789,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "S'ha finalitzat la baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -8855,55 +9900,55 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -8912,7 +9957,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -9283,6 +10328,11 @@ msgstr ""
 #~ msgstr ""
 #~ "Estableix comunicació amb el lector de llibres electrònics Sony PRS-600/700"
 
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr ""
+#~ "Estableix comunicació amb el lector de llibres electrònics Sony PRS-"
+#~ "300/505/500."
+
 #~ msgid "Communicate with the Cybook Opus eBook reader."
 #~ msgstr ""
 #~ "Estableix comunicació amb el lector de llibres electrònics Cybook Opus."
@@ -9297,3 +10347,8 @@ msgstr ""
 #~ msgid "Communicate with the BeBook Mini eBook reader."
 #~ msgstr ""
 #~ "Estableix comunicació amb el lector de llibres electrònics BeBook Mini."
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr ""
+#~ "Estableix comunicació amb el lector de llibres electrònics Sony PRS-"
+#~ "600/700/900."
diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index 0b8c2fa600..256bad7b7d 100644
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: calibre 0.7.2\n"
-"POT-Creation-Date: 2010-06-14 01:05+MDT\n"
-"PO-Revision-Date: 2010-06-14 01:05+MDT\n"
+"Project-Id-Version: calibre 0.7.4\n"
+"POT-Creation-Date: 2010-06-19 18:08+MDT\n"
+"PO-Revision-Date: 2010-06-19 18:08+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
@@ -38,12 +38,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
@@ -52,8 +52,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -99,20 +99,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:744
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1151
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
@@ -120,23 +120,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:846
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:880
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:917
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1515
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1517
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1639
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -257,62 +259,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
@@ -332,19 +334,19 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc, in landscape mode. Mainly useful for comics."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
@@ -364,15 +366,19 @@ msgstr ""
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -380,27 +386,27 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid "Customize plugin. Specify name of plugin and customization string separated by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -416,55 +422,66 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:75
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:77
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:83
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:196
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:214
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:217
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:229
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:282
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:318
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:806
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:832
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:300
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:337
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:841
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:875
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:325
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:837
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:344
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:880
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:499
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:518
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:703
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:741
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:705
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:743
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:776
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:812
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2178
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -487,6 +504,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -517,14 +538,18 @@ msgstr ""
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
@@ -571,15 +596,15 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
@@ -623,11 +648,11 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:142
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -648,59 +673,48 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid "Unable to detect the %s disk drive. Your  kernel is probably exporting a deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:775
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:809
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:815
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1399
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr ""
@@ -710,16 +724,20 @@ msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr ""
 
@@ -1251,7 +1269,7 @@ msgid "Normally, if the input file has no cover and you don't specify one, a def
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
-msgid "Do not use SVG for the book cover. Use this option if your EPUB is going to be used ona  device that does not support SVG, like the iPhone or the JetBook Lite. Without this option, such devices will display the cover as a blank page."
+msgid "Do not use SVG for the book cover. Use this option if your EPUB is going to be used on a device that does not support SVG, like the iPhone or the JetBook Lite. Without this option, such devices will display the cover as a blank page."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
@@ -1495,88 +1513,88 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:851
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:186
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:215
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1033
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1025
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr ""
 
@@ -1584,7 +1602,7 @@ msgstr ""
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files."
 msgstr ""
 
@@ -1670,6 +1688,10 @@ msgstr ""
 msgid "No cover found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1706,6 +1728,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1759,7 +1785,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
@@ -2025,6 +2051,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2201,7 +2229,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2280,341 +2308,388 @@ msgstr ""
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:241
-msgid "Use library only"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
 msgid "User annotations generated from main library only"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:72
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:636
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:786
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:851
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
 msgid "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:425
-msgid "Cannot delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1121
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1146
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:494
-msgid "The selected books will be <b>permanently deleted</b> and the files removed from your computer. Are you sure?"
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:515
-msgid "The selected books will be <b>permanently deleted</b> from your device. Are you sure?"
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:540
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:556
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:558
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:558
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:560
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:582
-msgid "Failed to download some metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid "The selected books will be <b>permanently deleted</b> and the files removed from your computer. Are you sure?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid "The selected books will be <b>permanently deleted</b> from your device. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:597
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:635
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:657
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "All book formats and metadata from the selected books will be added to the <b>first selected book.</b><br><br> The second and subsequently selected books will not be deleted or changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
 msgid "All book formats and metadata from the selected books will be merged into the <b>first selected book</b>.<br><br>After merger the second and subsequently selected books will be <b>deleted</b>. <br><br>All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently <b>deleted</b> from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:685
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
 msgid "You are about to merge more than 5 books.  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:785
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:822
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:829
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:888
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:968
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1121
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1182
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1127
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1135
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1183
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
 msgid "%s has no available formats."
 msgstr ""
 
@@ -2639,7 +2714,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
@@ -2750,17 +2825,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2779,8 +2854,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
@@ -2810,42 +2885,45 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:309
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1023
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
 msgid "Path"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:855
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
 msgid "Collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
 msgid "Click to open"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1032
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1036
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
@@ -2853,6 +2931,10 @@ msgstr ""
 msgid "None"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:308
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2912,7 +2994,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2930,8 +3012,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1362
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1380
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -4005,16 +4087,6 @@ msgstr ""
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
-msgid "Storage Card B"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
@@ -4035,168 +4107,173 @@ msgstr ""
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:706
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:737
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:826
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:916
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1015
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1076
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:917
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:975
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1077
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1045
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1162
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1251
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1252
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr ""
 
@@ -4339,159 +4416,159 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:499
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid "The value <b>%d</b> you have chosen for the content server port is a system port. Your operating system <b>may</b> not allow the server to run on this port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:648
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:649
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:754
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:789
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:820
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:878
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid "The changes you made require that Calibre be restarted. Please restart as soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:924
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly."
 msgstr ""
 
@@ -4583,300 +4660,305 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid "&Location of ebooks (The ebooks are stored in folders sorted by author and metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-msgid "Search as you type"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-msgid "Automatically send downloaded &news to ebook reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
-msgid "&Delete news from library when it is automatically sent to reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-msgid "&Number of covers to show in browse mode (needs restart):"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
-msgid "Toolbar"
+msgid "Show &average ratings in the tags browser"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-msgid "Large"
+msgid "Search as you type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
-msgid "Medium"
+msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-msgid "Small"
+msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
-msgid "&Button size in toolbar"
+msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-msgid "Show &text in toolbar buttons"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-msgid "Select visible &columns in library view"
+msgid "Large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+msgid "Medium"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
-msgid "Remove a user-defined column"
+msgid "Small"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+msgid "&Button size in toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
-msgid "Add a user-defined column"
+msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
-msgid "Edit settings of a user-defined column"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+msgid "Select visible &columns in library view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+msgid "Remove a user-defined column"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-msgid "Use internal &viewer for:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
-msgid "User Interface &layout (needs restart):"
+msgid "Add a user-defined column"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-msgid "Make &default"
+msgid "Edit settings of a user-defined column"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
-msgid "&Remove email"
+msgid "Use internal &viewer for:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
-msgid "calibre can send your books to you (or your reader) by email. Emails will be automatically sent for downloaded news to all email addresses that have Auto-send checked."
+msgid "User Interface &layout (needs restart):"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-msgid "&Maximum number of waiting worker processes (needs restart):"
+msgid "Add an email address to which to send books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
-msgid "&Check database integrity"
+msgid "&Add email"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
-msgid "&Install command line tools"
+msgid "Make &default"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
-msgid "Open calibre &configuration directory"
+msgid "&Remove email"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
-msgid "Limit the max. simultaneous jobs to the available CPU &cores"
+msgid "calibre can send your books to you (or your reader) by email. Emails will be automatically sent for downloaded news to all email addresses that have Auto-send checked."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Debug &device detection"
+msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart."
+msgid "&Check database integrity"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Server &port:"
+msgid "&Install command line tools"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Open calibre &configuration directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Limit the max. simultaneous jobs to the available CPU &cores"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "Debug &device detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "Server &port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "If you leave the password blank, anyone will be able to access your book collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "The maximum size (widthxheight) for displayed covers. Larger covers are resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as calibre is running.\n"
 "<p>Stanza should see your calibre collection automatically. If not, try adding the URL http://myhostname:8080 as a new catalog in the Stanza reader on your iPhone. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Here you can customize the behavior of Calibre by controlling what plugins it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4923,9 +5005,10 @@ msgstr ""
 #:
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:853
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
 
@@ -5135,6 +5218,31 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5792,12 +5900,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr ""
 
@@ -5903,12 +6011,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5940,23 +6048,23 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid "Delete item from database. This will unapply the item from all books and then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6217,136 +6325,140 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
 msgid "Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:339
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:368
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
 msgid "Book Details"
 msgstr ""
 
@@ -6430,33 +6542,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:659
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1100
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:850
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1085
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -6500,11 +6608,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid "Dropping onto a device is not supported. First add the book to the calibre library."
 msgstr ""
 
@@ -6864,20 +6972,20 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
 msgid "Saved Searches"
 msgstr ""
 
@@ -6953,61 +7061,74 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
-msgid "Rename"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:169
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:377
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:652
-msgid "Sort by &popularity"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
 msgid "Manage &user categories"
 msgstr ""
 
@@ -7046,92 +7167,92 @@ msgstr ""
 msgid "The following books have already been converted to %s format. Do you wish to reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:494
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:522
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid "is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:647
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid "will keep running in the system tray. To close it, choose <b>Quit</b> in the context menu of the system tray."
 msgstr ""
 
@@ -8364,43 +8485,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1665
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1711
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1804
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1845
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1867
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -8555,43 +8680,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -8733,34 +8858,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -8842,67 +8971,67 @@ msgstr ""
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:827
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:848
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:859
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:942
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:958
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:968
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:980
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1020
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1216
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1298
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1315
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1462
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid "Failed to log in, check your username and password for the calibre Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1478
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid "You do not have permission to download this issue. Either your subscription has expired or you have exceeded the maximum allowed downloads for today."
 msgstr ""
 
diff --git a/src/calibre/translations/cs.po b/src/calibre/translations/cs.po
index 46a575ebe3..65d3cfe0a7 100644
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-07 22:52+0000\n"
-"Last-Translator: JanS <Unknown>\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:14+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-09 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Nedělá vůbec nic"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -292,62 +294,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Tento profil je určen pro SONY PSR 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Tento profil je určen pro SONY PSR 900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Tento profil je určený pro Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Tento profil je určený pro knihy Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Tento profil je určený pro Hanlin V3 a jeho klony."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Tento profil je určen pro Hanlin V5 a jeho klony."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Tento profil je určený pro Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Tento profil je určen pro Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Tento profil je určený pro Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Tento profil je určen pro Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Tento profil je určen pro Irex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Tento profil je určený pro IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Tento profil je určen pro B&N Nook."
 
@@ -374,15 +376,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Tento profil je určen pro SONY PSR 300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Tento profil je určen pro 5\" Jetbook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -390,7 +392,7 @@ msgstr ""
 "Tento profil je určený pro zařízení SONY PRS. 500/505/700 atd. pro čtení na "
 "šířku. Nejvíce užitečné pro čtení komiksu."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Tento profil je určený pro Amazon Kindle DX."
 
@@ -410,15 +412,19 @@ msgstr "Úprava Lokálních modulů"
 msgid "Disabled plugins"
 msgstr "Deaktivované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Nebyl nalezen žádný platný modul v "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicializace modulu %s selhala s chybou:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -430,30 +436,30 @@ msgstr ""
 "    Přizpůsobte calibre nahráním externích modulů.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Přidejte modul zadáním cesty k ZIP archivu v kterém se nachází."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Odebrat modul podle jména. Vestavěné moduly není možné odebrat."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Upravit modul. Zadejte název modulu a retězec s úpravami oddělené čárkou."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Vypsat všechny nainstalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Aktivovat modul podle jména"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Deaktivovat modul podle jména"
 
@@ -469,59 +475,70 @@ msgstr ""
 "seznam adresářů oddělený čárkami k odeslání knih na zařízení. První který "
 "existuje pude použit."
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "Záznamy metadat v zařízení se aktualizují..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
-msgstr ""
+msgstr "hotovo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "nastavení ovladačů zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Setříděný seznam formátů, které toto zařízení přijme."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Zprávy"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Komunikuje se čtečkou Binatone Readme."
@@ -544,6 +561,10 @@ msgstr "Komunikuje se čtečkou Cybook Gen 3 / Opus."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Komunikace s zařízením EB600."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -556,6 +577,10 @@ msgstr "Spojit s Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Komunikace s zařízením ESlick eBook."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -570,14 +595,20 @@ msgstr "Rozhraní zařízení"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Komunikuje se čtečkou Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Komunikuje se čtečkou Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Komunikace se čtečkou BOOX eBook."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Komunikuje se čtečkou Hanvon N520."
@@ -604,7 +635,7 @@ msgstr "Komunikace s zařízením Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -624,15 +655,15 @@ msgstr "Komunikuje se čtečkou Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Komunikace s zařízením JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Komunikace s zařízením Amazon Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Komunikace s zařízením Amazon Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Komunikuje se čtečkou Kindle DX."
 
@@ -676,7 +707,7 @@ msgstr "Komunikace s zařízením Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -684,7 +715,7 @@ msgstr ""
 "Čárkami oddělený seznam metadata polí ze kterých se má vytvořït Sbírka na "
 "zařízeni. Možnosti zahrnují: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Nepojmenovaný"
@@ -705,23 +736,23 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Nepodařilo se najít disk %s. Zkuste reboot."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "nemohu nalézt %s přípojný bod. Zkuste rebootovat."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Nemohu detekovat disk %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Nemohu nalézt mount helper: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -729,39 +760,28 @@ msgstr ""
 "Nemohu detekovat disk %s. Váš Kernel pravděpodobně exportuje zastaralou "
 "verzi SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Nemohu připojit hlavní paměť (Kód chyby: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Čtečka nemá v tomto slotu žádnou pamětovou kartu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Vybraný slot: %s není podporováno."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "V hlavní paměti není dostatek volného místa"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Na paměťové kartě není dostatek volného místa"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Zprávy"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Konfigurovat zařízení"
@@ -771,57 +791,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Uložit soubory do podadresářů pokud je zařízení podporuje."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Číst metadata ze souborů zařízení"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Šablona určující jak se májí knihy ukládat"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Další přizpůsobení"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Komunikace s čtecím zařízením."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Zjistit informace o zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Získávám seynam knih na zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Přenos knih do zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Přidávám knihy do seznamu metadat v zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Odstraňuji knihy ze zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Odebírám knihy ze seznamu metadat v zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Odesílám metadata do zařízení..."
 
@@ -1365,6 +1389,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"Odstraní-li calibre mezery mezi odstavci, dojde k automatickému nastavení "
+"odsazení, aby bylo možné odstavce snadno rozeznat. Tato volba upravuje šířku "
+"odsazení."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
@@ -1531,15 +1558,15 @@ msgstr "Hodnota pořadí v sérii musí být číslo, Ignoruji"
 msgid "Failed to parse date/time"
 msgstr "Nepodařilo se analyzovat datum/čas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Převést vstup do HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Probíhá převod elektronické knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Vytvářím"
 
@@ -1878,84 +1905,88 @@ msgstr "Font pro neproporcionání písmo"
 msgid "Comic"
 msgstr "Komiks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Název"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(ři)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Vydavatel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Komentáře"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Tagy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Jazyk:"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Časová značka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publikováno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Práva"
 
@@ -1963,7 +1994,7 @@ msgstr "Práva"
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2064,6 +2095,10 @@ msgstr "Obálka uložena do"
 msgid "No cover found"
 msgstr "Obálka nenalezena"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Stáhnutí metadat"
@@ -2104,6 +2139,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Stáhnout sociální metadata z amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2166,7 +2205,7 @@ msgstr ""
 "\n"
 "Stáhnout obálku knihy identifikované uvedeným kódém ISBN z LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Obálka"
@@ -2453,6 +2492,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2660,8 +2701,8 @@ msgid "Use Roman numerals for series number"
 msgstr "číslování knih v sérii římskými číslicemi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Třídit seznam tagů pode popularity"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2738,23 +2779,418 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "&Kopírovat do schránky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Nejsou označeny žádné knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Odesílám knihy do zařízení"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "TXT knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Komiksy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Archívy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Není označena žádná kniha"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Mažu knihy ze zařízení."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Označené knihy budou <b> trvale smazány </b> a soubory budou odstraněny z "
+"vašeho počítače. Opravdu je chcete odstranit?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Nemůžu stáhnout metadata."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "obálky"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Stahuji %s pro %d knihu(y)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Selhalo stahování některých metadat"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Selhalo stahovaní metadat pro následující:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Selhalo stahování metadat:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Chyba"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Nemůžu upravit metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Chyba zápisu na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Zvolte cílový adresář"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Chyba při ukládání"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Při ukládání nastala chyba."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Nemohu uložit některé knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Klikněte na tlačítko zobrazit detaily pro zjištění které z nich."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Získávám zprávy z "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " získány."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Nemůžu převást"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Nemůžu zobrazit"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Vyberte formát který se má zobrazit"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Nemohu otevřít adresář"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s není dostupná v žádném dostupném formátu."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Hledám v"
@@ -2776,15 +3212,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Žádné knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
@@ -2904,17 +3335,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2933,17 +3364,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2965,6 +3396,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Cesta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formáty"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Žádné"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -3024,7 +3507,7 @@ msgstr "výstup"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3042,8 +3525,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3385,6 +3868,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"<p>Odstraní-li calibre mezery mezi odstavci, dojde k automatickému nastavení "
+"odsazení, aby bylo možné odstavce snadno rozeznat. Tato volba upravuje šířku "
+"odsazení."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
@@ -3725,11 +4211,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "RB Výstup"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Vyberte formát který se má zobrazit"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3810,12 +4291,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3835,7 +4316,7 @@ msgstr "&Značka kapitol:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
-msgstr ""
+msgstr "Odstranit první &obrázek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
@@ -3847,11 +4328,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
-msgstr ""
+msgstr "Odstranit &patičku stránky"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
-msgstr ""
+msgstr "Odstranit &záhlaví"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
@@ -4023,11 +4504,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Prohlížet obálky"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4048,280 +4537,294 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
-msgstr ""
+msgstr "Odstranit všechny tagy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "Zařízení už není připojené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Získat informace o zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Získat seznam knih v zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Odeslat metadata do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Odeslat %d knih do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Smazat knihy ze zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Převzít knihy ze zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Zobrazit knihu v zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Nastavit výchozí nastavení pro odeslání do čtečky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Odeslat do hlavní paměti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Odeslat na pamětovou kartu A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Odeslat na pamětovou kartu B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Cyba komunikace se zařízením"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Chyba komunikace se zařízením"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Dočasná chyba komunikace se zařízením. Prosím odpojte a znovu připojte "
+"zařízení anebo restarujte počítač."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Zařízení: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " nalezeno."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Připojeno "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "vybrané k odeslání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Vyberte formát k odeslání do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Žádné zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Nemohu odeslat: Není připojeno žádné zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Žádná karta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Nemohu odeslat: Zařízení nemá pamětovou kartu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Odeslat email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Žádné vhodné formáty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Zprávy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Odeslat zprávy do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Odeslat katalog do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Odesílám zprávy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Odesílám knihy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Na zařízení není volné místo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Knihy není možné odeslat do zařízení pro nedostatek volného úložného "
 "prostoru "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Cesta"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formáty"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4467,167 +4970,167 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Chyba"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "Selhala Instalce nástrojů pro příkazovou řádku."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "Chybí platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s není platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Zvolte modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Modul není možné deaktivovat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Modul %s nemůže být deaktivován"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Modul není upravitelný"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Modul %s nevyžaduje žádné úpravy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Vestavěný modul není možné odstranit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " nemůže být odstraněn. Je to vestavěbý modul. Skuste ho místo odstranění "
 "deaktivovat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Záznam o chybách:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Záznam o přístupu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Nepodařilo se spustit obdahový server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Neplatná velikost"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Velikost %s je neplatná. Požadovaný formát je šířka x výška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Neplatné umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Neplatné umístění databáze "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Musí být adresář."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neplatné umístění databáze. <br> Nemůžu zapsat do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4738,13 +5241,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Odeslání do &zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4752,27 +5256,27 @@ msgstr ""
 "&Umístění elektronických knih (Knihy jsou umístěné v adresářích podla autora "
 "a metadata jsou uložené v souboru metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Určete nové umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Zobrazit upozornění pokud je dostupná &nová verze."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "Výchozí časový &limit sítě:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -4780,166 +5284,174 @@ msgstr ""
 "Výchozí časový limit pro síťové dotazy (např. pokaždé když jdeme na Internet "
 "získat informace)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normální"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Vysoká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Nízká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Priorita úloh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Upřednostňovaný výstupní formát:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Pořadí preference &vstupních formátů:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Číslovat knihy v sérii &Římskými číslicemi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Zobrazit &ikonu v sýstémové liště (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Zobrazovat upozor&nění v systémové liště"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zobrazit prohlížec &obálek v samostatném okně (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Vyhledávat při zadávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "&Automaticky odeslat stažené zprávy do čtecího zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "Smazat zprávy z knihovny když jsou automaticky odeslány do čtečky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Počet obálek zobraze&ných v přohlížecím módu (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Velké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Střední"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&Velikost tlačítek na panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Zobrazit &text na tlačítkách panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Viditelné sloup&ce v seznamu knih v knihovne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Použít interní &prohlížec pro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Přdat emailovou adresu na kterou posílat knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "Přidat em&ail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Nastavit &výchozí"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "Odst&ranit email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximální počet procesů ve frontě (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -4949,25 +5461,25 @@ msgstr ""
 "pomocí internetového prohlížeče z jakehokoliv místa na světě. Změny v "
 "nastaení se projeví až po restartu serveru."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Port serveru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Uživatelské jméno:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Heslo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -4975,7 +5487,7 @@ msgstr ""
 "Pokud ponecháte heslo prázdné, kdokoliv bude mít přístup k vaší zbírce knih "
 "přes webové rozhraní."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -4983,45 +5495,45 @@ msgstr ""
 "Maximální velikost (šířka x výška) zobrazených obálek. Velké obálky budou "
 "zmenšené. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Max. velikost &obálek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Zobrazit he&slo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Spustit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "&Zastavit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Test serveru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "&Automaticky spustit server při startu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Zobrazit &serverové záznamy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5032,34 +5544,34 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Tady můžete upravit chování calibre, určením které moduly bude používat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Aktivovat/&Deaktivovat modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Upravit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Odstranit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Přidat nový modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Soubor modulu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "Přid&at"
 
@@ -5096,10 +5608,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
 
@@ -5115,68 +5628,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5285,6 +5799,27 @@ msgstr "&Znovu zobrazit toto upozornění"
 msgid "ERROR"
 msgstr "CHYBA"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Formát"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Autor (seřadit jako)"
@@ -5491,11 +6026,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Knihy"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5534,67 +6064,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Stáhnout obálku..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Špatná obálka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5951,12 +6489,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autoři"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -6071,12 +6609,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "Přidat tag do seznamu dostupných tagů a aplikovat na aktuální knihu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6108,25 +6646,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6380,11 +6918,11 @@ msgstr "Regulární výraz (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Žádná shoda"
 
@@ -6420,54 +6958,209 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulární výraz (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Uložit jediný formát na disk..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Upravit metadata Individuálně"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Upravit metadata dávkově"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Stáhnout metadata a obálky"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Stáhnout pouze metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Stáhnout pouze obálky"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Přidat Knihy z jednoho adresáře"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Přidat knihy z adresárů, včetně podadresářů (předpokládá se, že každý "
+"adresář představuje jednu knihu a soubory v něm jsou různé formáty té samé "
+"knihy)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Přidat knihy z adresárů, včetně podadresářů (vícero knih v jednom adresáři, "
+"předpokládá se že každý soubor představuje jednu knihu)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Přidat prázdnou knihu. (Položka knihy bez žádných formátů)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Uložit na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Uložit na disk v jednom adresáři"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Uložit jen formát %s na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Zobrazit"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Zobrazit určitý formát"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Smazat vybrané knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Odstranit soubory se zvoleným formátem z označených knih"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+"Odstranit všechny soubory se zvoleným formátem z označených knih, mimo..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Převést Individuálně"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Převést dávkově"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Spustit uvítacího průvodce"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Podobné knihy..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Úloha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Stav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Průběh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Uplynulý čas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Neznáma úloha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Nemůžu ukončit úlohu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Není možné ukončit úlohy, které komunikují se zařízením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Úloha je již dokončená"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Není k dispozici"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Úlohy:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Kliknutím zobrazíte seznam aktivních úloh."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Úlohy"
 
@@ -6479,112 +7172,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Žádné"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Kniha <font face=\"serif\">%s</font> z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Formát"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Nedovolené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6682,282 +7353,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Neplatné umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Nemůžu spistit "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s je již spuštěno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "pravá horní oblast obrazovky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "pravý dolní okraj obrazovky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "skuste restartovat počítač."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "pokuste se vymazat smazat soubor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Rozšířené vyhledávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Hledat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Zrušit rychlé vyhledávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Zkopírovat právě hledaný text (namísto hledání názvu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Setřídit podle &popularity"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Najít kterékoliv"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Porovnat vše"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Přidat knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Odstranit knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Upravit Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Odeslat do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Uložit na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Stáhnout zprávy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Převést knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Zobrazit"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Otevřít nadřazený adresář"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Zobrazit podrobnosti o knize"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Knihy od stejného autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Knihy v této sérii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Knihy od tohoto vydavatele"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Knihy se stejnými tagy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Nastavit calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -6989,15 +7631,35 @@ msgstr "Kniha nemá ani název ani ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Vyhledávání (pro rozšířené vyhledávání klikněte na tlačítko vlevo)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "Všechny knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -7058,82 +7720,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Úlohy:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Kliknutím zobrazíte seznam aktivních úloh."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Porovnat vše"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Najít kterékoliv"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7175,631 +7830,104 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Uložit jediný formát na disk..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Vyhledávání (pro rozšířené vyhledávání klikněte na tlačítko vlevo)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Cyba komunikace se zařízením"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Obnovit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "&Přispějte na vývoj calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Restart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>Nápovědu najdete: <a href=\"%s\">User Manual</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Upravit metadata Individuálně"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Upravit metadata dávkově"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Stáhnout metadata a obálky"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Stáhnout pouze metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Stáhnout pouze obálky"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Přidat Knihy z jednoho adresáře"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Přidat knihy z adresárů, včetně podadresářů (předpokládá se, že každý "
-"adresář představuje jednu knihu a soubory v něm jsou různé formáty té samé "
-"knihy)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Přidat knihy z adresárů, včetně podadresářů (vícero knih v jednom adresáři, "
-"předpokládá se že každý soubor představuje jednu knihu)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Přidat prázdnou knihu. (Položka knihy bez žádných formátů)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Uložit na disk v jednom adresáři"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Uložit jen formát %s na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Zobrazit určitý formát"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Smazat vybrané knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Odstranit soubory se zvoleným formátem z označených knih"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-"Odstranit všechny soubory se zvoleným formátem z označených knih, mimo..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Smazat obálku z označených knih"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Převést Individuálně"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Převést dávkově"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Spustit uvítacího průvodce"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Podobné knihy..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Prohlížet obálky"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "Všechny knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Zařízení: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " nalezeno."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Připojeno "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Databáze zařízení je poškozená"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>Databáze knih v zařízení je poškozená. Skuste nasledující "
-"postup:\n"
-"                <ol>\n"
-"                <li>Odpojte zařízení. Počkejte dokud neobnoví databázi (t.j. "
-"dokud nebude připravené na použití). Znovu ho zapojte. Potom by mělo "
-"fungovať s %(app)s. Pokud ne, skuste nasledující krok.</li>\n"
-"                <li>Zavřetee %(app)s. Najděte soubor media.xml v hlavní "
-"paměti zařízení a smažte ho. Odpojte zařízeníe. Počkajte Dokud soubor "
-"nezregeneruje. Zařízení znovu připojte a spusťte %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Nejsou označeny žádné knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Odesílám knihy do zařízení"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "TXT knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Komiksy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Archívy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Není označena žádná kniha"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Označené knihy budou <b> trvale smazány </b> a soubory budou odstraněny z "
-"vašeho počítače. Opravdu je chcete odstranit?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Mažu knihy ze zařízení."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Nemůžu stáhnout metadata."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "obálky"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Stahuji %s pro %d knihu(y)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Selhalo stahování některých metadat"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Selhalo stahovaní metadat pro následující:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Selhalo stahování metadat:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Nemůžu upravit metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Chyba zápisu na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Zvolte cílový adresář"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Chyba při ukládání"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Při ukládání nastala chyba."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Nemohu uložit některé knihy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "Klikněte na tlačítko zobrazit detaily pro zjištění které z nich."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Získávám zprávy z "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " získány."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Nemůžu převást"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Nemůžu zobrazit"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Nemohu otevřít adresář"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s není dostupná v žádném dostupném formátu."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Nemůžu nastavit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Nastavení není možné změnit dokud neproběhne zpracování všech úloh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Bližší informace nejsou dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "Bližší informace o knihách v tomto zařízení nejsou dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Chyba komunikace se zařízením"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Dočasná chyba komunikace se zařízením. Prosím odpojte a znovu připojte "
-"zařízení anebo restarujte počítač."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Chyba převodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
+"<p>Nelze převést: %s<p> Kniha je chráněna pomocí <a href=\"%s\">DRM</a>. "
+"Před převodem nejprve musíte odstranit DRM pomocí nástroje třetí strany."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Zdroj zakázán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Prpbíha zpracování úloh. Opravdu chcete program ukončit?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "UPOZORNĚNÍ: Probíhá zpracování úloh."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7807,11 +7935,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Poslední verze: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Aktualizace dostupná"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8280,82 +8408,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Klikněte pro zobrazení knih dostupných ve vašem počítači"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8618,48 +8758,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8885,7 +9025,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
-msgstr ""
+msgstr "Je třeba určit alespoň jednu knihu k odstranění"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
@@ -9037,7 +9177,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 "Zobrazit podrobné výstupní informace. Užitečné pro hledání chyb v programu"
@@ -9119,43 +9259,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9341,43 +9485,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9520,34 +9664,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9604,97 +9752,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Neznámý zdroj zpráv"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\" zdroj musí obsahovat jméno a heslo."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " od "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Stáhnout zdroje z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Stahování obálky z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Nepojmenovaný článek"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Článek stažen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9715,7 +9863,7 @@ msgstr "Naplánováno"
 msgid "Custom"
 msgstr "uživatelský"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9725,18 +9873,18 @@ msgstr ""
 "\n"
 "Kde URL je například http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Základní adresář, do kterého bude URL uloženo. Standardně je to %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "Časový limit čekání na odezvu ze serveru. Standardně: %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -9744,7 +9892,7 @@ msgstr ""
 "Maximání hloubka rekurze, t.j. počet úrovní odkazů, které se mají procházet. "
 "Standardně %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9752,13 +9900,13 @@ msgstr ""
 "Maximální počet stahovaných souborů. Tato hodnota se vztahuje na soubory v "
 "<a href> tagách. Standardně %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "Minimální interval stahování v sekundách. Standatně %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9766,7 +9914,7 @@ msgstr ""
 "Kódování znaků použité na webových stránkách, které chcete stáhnout. "
 "Vevýchozím nastavení se program pokusí rozeznat kódování automaticky."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -9777,7 +9925,7 @@ msgstr ""
 "se shodují minimálně s jedním výrazem. Standardně budou následovány všechny "
 "odkazy."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9791,7 +9939,7 @@ msgstr ""
 "odkazy. V případě, že jsou použity obě mořnosti, --filter-regexp i --match-"
 "regexp bude --filter-regexp aplikován jako první."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Nestahovat kaskádové styly."
 
@@ -10617,6 +10765,9 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgstr ""
 #~ "Formát, který má byt použit při ukládání jednotlivých souborů na disk"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Třídit seznam tagů pode popularity"
+
 #~ msgid " plugins"
 #~ msgstr " moduly"
 
@@ -10882,6 +11033,12 @@ msgstr "Nestahovat kaskádové styly."
 #~ "<p>Pro další nápovědu nevštivte <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Databáze zařízení je poškozená"
+
+#~ msgid "Sort by &popularity"
+#~ msgstr "Setřídit podle &popularity"
+
 #~ msgid "Click to browse books by their covers"
 #~ msgstr "Kliknutím otevřete prohlížec obálek"
 
@@ -10903,6 +11060,33 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "Tento profil je určen pro řadu SONY PRS. Zařízení 500/505/700 atd."
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>Databáze knih v zařízení je poškozená. Skuste nasledující "
+#~ "postup:\n"
+#~ "                <ol>\n"
+#~ "                <li>Odpojte zařízení. Počkejte dokud neobnoví databázi (t.j. "
+#~ "dokud nebude připravené na použití). Znovu ho zapojte. Potom by mělo "
+#~ "fungovať s %(app)s. Pokud ne, skuste nasledující krok.</li>\n"
+#~ "                <li>Zavřetee %(app)s. Najděte soubor media.xml v hlavní "
+#~ "paměti zařízení a smažte ho. Odpojte zařízeníe. Počkajte Dokud soubor "
+#~ "nezregeneruje. Zařízení znovu připojte a spusťte %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Zvolte umístění pro vaši elektronickou knihovnu."
 
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 7e61589c11..09c2e17eda 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-09 22:10+0000\n"
-"Last-Translator: S. Dorscht <Unknown>\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:13+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -24,12 +24,12 @@ msgstr "Macht absolut gar nichts"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -41,22 +41,22 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -102,44 +102,46 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -295,62 +297,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Dieses Profil ist geeignet für das SONY PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Dieses Profil ist geeignet für das SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Dieses Profil ist geeignet für den Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Dieses Profil ist geeignet für Mobipocket-Bücher."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Dieses Profil ist geeignet für den Hanlin V3 und dessen Klone."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Dieses Profil ist geeignet für den Hanlin V5 und dessen Klone."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Dieses Profil ist geeignet für das Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Dieses Profil ist geeignet für den Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Dieses Profil ist geeignet für den Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Dieses Profil ist geeignet für den Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Dieses Profil ist geeignet für den IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Dieses Profil ist geeignet für den IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Dieses Profil ist geeignet für den B&N Nook."
 
@@ -378,15 +380,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Dieses Profil ist geeignet für den Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Dieses Profil ist geeignet für das SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Dieses Profil ist geeignet für das 5-Zoll JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -394,7 +396,7 @@ msgstr ""
 "Dieses Profil ist geeignet für die SONY PRS-Reihe. PRS 500/505/700 etc. in "
 "horizontaler Darstellung. Vor allem für Comics hilfreich."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Dieses Profil ist geeignet für den Amazon Kindle DX."
 
@@ -414,15 +416,19 @@ msgstr "Lokale Plugin-Anpassung"
 msgid "Disabled plugins"
 msgstr "Ausgeschaltene Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Kein gültiges Plugin gefunden in "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Starten des Plugins %s schlug fehl. Traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -434,19 +440,19 @@ msgstr ""
 "    Calibre anpassen durch das Laden externer Plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Plugin hinzufügen durch die Angabe des Pfads zur ZIP-Datei, die das Plugin "
 "enthält."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Anpassbares Plugin entfernen. Dies hat keinen Einfluss auf festinstallierte "
 "Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -454,15 +460,15 @@ msgstr ""
 "Plugin anpassen. Geben Sie den Namen des Pugins und die Anpassung durch ein "
 "Komma getrennt an."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Installierte Plugins auflisten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Gewähltes Plugin einschalten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Gewähltes Plugin ausschalten"
 
@@ -478,37 +484,36 @@ msgstr ""
 "Durch Kommata getrennte Liste von Verzeichnissen an die eBooks auf das Gerät "
 "gesendet werden. Das erste vorhandene wird benutzt"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Kommunikation mit S60-Telefonen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Kommunikation mit iBooks über iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Gerät von Apple entdeckt, starte iTunes, einen Moment bitte..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Aktualisiere die Liste der Geräte-Metadaten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d von %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "abgeschlossen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -518,17 +523,17 @@ msgstr ""
 "Zum Löschen die iBooks App verwenden.\n"
 "Klicken Sie 'Zeige Details' für eine Liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "Einstellungen der Geräte-Treiber"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Geordnete Liste der Formate, die das Gerät akzeptiert"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -536,6 +541,18 @@ msgstr ""
 "Einige Umschlagbilder konnten nicht konvertiert werden.\n"
 "Klicken Sie 'Zeige Details' für eine Liste."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Nachrichten"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Kommunikation mit dem Binatone Readme eBook Reader."
@@ -558,6 +575,10 @@ msgstr "Kommunikation mit dem Cybook Gen 3 / Opus eBook Reader."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Kommunikation mit dem EB600 eBook Reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -570,6 +591,10 @@ msgstr "Kommunikation mit dem Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Kommunikation mit dem ESlick eBook Reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Kommunikation mit dem Sigmatek eBook Reader."
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -584,14 +609,20 @@ msgstr "Geräte-Schnittstellen"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Kommunikation mit Hanlin V3 eBook Readern."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Kommunikation mit Hanlin V5 eBook Readern."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Kommunikation mit dem BOOX eBook Reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Kommunikation mit dem Hanvon N520 eBook Reader."
@@ -618,7 +649,7 @@ msgstr "Kommunikation mit dem IRex Iliad eBook Reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -638,15 +669,15 @@ msgstr "Kommunikation mit dem Iriver Story Reader."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Kommunikation mit dem JetBook eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Kommunikation mit dem Kindle eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Kommunikation mit dem Kindle 2 eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Kommunikation mit dem Kindle DX eBook Reader."
 
@@ -690,7 +721,7 @@ msgstr "Kommunikation mit dem Sony PRS-500 eBook Reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunikation mit allen Sony eBook Readern."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -698,7 +729,7 @@ msgstr ""
 "Mit Kommata getrennte Liste von Metadatenfeldern um Büchersammlungen auf dem "
 "Gerät zu erstellen. Möglichkeiten sind: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Unbenannt"
@@ -719,25 +750,25 @@ msgstr "Kommunikation mit dem Newsmy Reader."
 msgid "Communicate with the iPapyrus reader."
 msgstr "Kommunikation mit dem iPapyrus Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 "Das Laufwerk %s konnte nicht gefunden werden. Versuchen Sie einen Neustart."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Konnte den %s Mount Point nicht finden. Versuchen Sie einen Neustart."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Das %s-Laufwerk konnte nicht erkannt werden."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Mount Helper konnte nicht gefunden werden: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -745,39 +776,28 @@ msgstr ""
 "%s Festplatte konnte nicht erkannt werden. Ihr Kernel exportiert "
 "möglicherweise eine abgelehnte Version von SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Hauptspeicher konnte nicht eingehängt werden (Fehler-Code: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Das Gerät hat keine Speicherkarte in diesem Laufwerk."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Gewählter Slot: %s wird nicht unterstützt."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Nicht genügend freier Spreicherplatz im Hauptspeicher"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Nachrichten"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Gerät konfigurieren"
@@ -788,57 +808,61 @@ msgstr ""
 "Dateien in Unterverzeichnissen speichern soweit das Gerät dies unterstützt"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Metadaten aus Dateien auf dem Gerät lesen"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Vorlage zur Kontrolle wie Bücher gespeichert werden"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Besondere Anpassung"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Kommunikation mit einem eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Geräte-Information beziehen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Die Liste der Bücher auf dem Gerät beziehen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Bücher ans Gerät übertragen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Bücher zur Metadaten-Liste des Geräts hinzufügen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Bücher vom Gerät entfernen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Bücher von der Metadaten-Liste des Geräts entfernen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Metadaten ans Gerät senden ..."
 
@@ -1613,15 +1637,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr "Analyse von Datum/Zeit schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Eingabe zu HTML konvertieren ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Veränderungen am eBook durchführen ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Erstellen"
 
@@ -2000,84 +2024,88 @@ msgstr "Nichtproportionale Schriftartfamilie einbetten"
 msgid "Comic"
 msgstr "Comic"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produzent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Bemerkung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketten (Tags)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Reihe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Rechte"
 
@@ -2085,7 +2113,7 @@ msgstr "Rechte"
 msgid "EDITORIAL REVIEW"
 msgstr "BUCHKRITIK"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2212,6 +2240,10 @@ msgstr "Umschlagbild gespeichert unter"
 msgid "No cover found"
 msgstr "Kein Umschlagbild gefunden"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Metadaten laden"
@@ -2252,6 +2284,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Lädt soziale Metadaten von amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2326,7 +2362,7 @@ msgstr ""
 "Umschlagbild des Buches mit der angegebenen ISBN von LibraryThing.com "
 "abrufen\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Umschlagbild"
@@ -2660,6 +2696,8 @@ msgstr ""
 "Zeigt Informationen über das PDF an.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2929,8 +2967,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Benutze römische Ziffern für Reihennummerierung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Liste der Etiketten nach Beliebtheit sortieren"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -3013,23 +3051,439 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr "Etiketten-Browser Kategorien nicht anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "Das Aussehen der Benutzeroberfläche"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopiert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Nur Bibliothek verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "Nur aus der Hauptbibliothek erstellte Benutzeranmerkungen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Keine Bücher ausgewählt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "Es sind keine Bücher zum Abrufen von Anmerkungen ausgewählt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "Füge Benutzeranmerkungen zur Datenbank hinzu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Letzte gelesene Seite: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Letzte gelesene Seite: Position %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Position %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Seite %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Position %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "Wie viele leere Bücher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "Wie viele leere Bücher sollen hinzugefügt werden?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Lade Bücher auf das Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Topaz Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Text Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Comics"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Archive"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Unterstützte Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Einige Bücher zusammenfügen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Es wurden einige Duplikate gefunden und mit den folgenden, schon vorhandenen "
+"Büchern zusammengefügt:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Lesen der Metadaten schlug fehl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Lesen der Metadaten schlug fehl bei folgenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Kein Buch ausgewählt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "Löschen nicht möglich"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Zu löschende Formate auswählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "<b>Nicht</b> zu löschende Formate auswählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr "Speicherkarte A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr "Speicherkarte B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Lösche Bücher vom Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Die gewählten Bücher werden <b>dauerhaft gelöscht</b> und die Dateien vom "
+"Computer entfernt. Sin Sie sicher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"Die gewählten Bücher werden von ihrem Gerät <b>dauerhaft gelöscht</b>. Sind "
+"Sie sicher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Konnte Metadaten nicht laden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "soziale Metadaten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "Umschlagbilder"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "Metadaten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Lade %s für %d Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Das Laden der Metadaten schlug teilweise fehl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Das Laden der Metadaten schlug für folgende Bücher fehl:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Laden der Metadaten schlug fehl:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Fehler"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Kann Metadaten nicht bearbeiten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Konnte Bücher nicht zusammenfügen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Es müssen wenigstens zwei Bücher zum Zusammenfügen ausgewählt werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Alle Buchformate und Metadaten des gewählten Buches werden zum <b>zuerst "
+"gewählten Buch</b> hinzugefügt.<br><br> Das zweite und danach gewählte "
+"Bücher werden nicht gelöscht oder verändert.<br><br>Zum Fortfahren bitte "
+"bestätigen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Alle Buchformate und Metadaten des gewählten Buches werden zum <b>zuerst "
+"gewählten Buch</b> hinzugefügt.<br><br>Nach dem Zusammenfügen werden das "
+"zweite und danach gewählte Bücher <b>gelöscht</b>. <br><br>Alle Buchformate "
+"des zuerst gewählten Buches bleiben bestehen und alle doppelten Formate im "
+"zweiten und den danach gewählten Bücher werden unwiderruflich von Ihrem "
+"Rechner <b>gelöscht</b>.<br><br>  Wollen Sie <b>wirklich</b> fortfahren?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Sie versuchen mehr als 5 Bücher zusammenzufügen. Wollen Sie damit "
+"<b>wirklich</b> fortfahren?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Speichern auf Festplatte nicht möglich"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Zielverzeichnis auswählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Fehler während des Speicherns"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Es gab einen Fehler während des Speicherns."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Konnte einige Bücher nicht speichern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+"Klicken Sie auf die Schaltfläche Details zeigen, um zu sehen, welche es gibt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Keine Bücher ausgewählt, für die ein Katalog erstellt werden soll"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Erstelle %s Katalog..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Keine Bücher gefunden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr "Keine Bücher im Katalog. Bitte ausgeschlossene Etiketten prüfen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Katalog erstellt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Katalog-Verzeichnis exportieren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Wählen Sie das Ziel für %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Rufe Nachrichten ab von "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " abgerufen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Konvertierung nicht möglich"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Starte Konvertierung von %d Büchern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Ansehen nicht möglich"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Format zur Vorschau wählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Mehrere Bücher ausgewählt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+"Sie versuchen %d Bücher zu öffnen. Das gleichzeitige Öffnen zu vieler Bücher "
+"kann lange dauern und einen negative Wirkung auf die Reaktionszeit Ihres "
+"Rechners haben. Einmal gestartet kann der Prozess nicht beendet werden, "
+"bevor er abgeschlossen ist. Möchten Sie fortfahren?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Konnte Verzeichnis nicht öffnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s hat keine verfügbaren Formate."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Suche in"
@@ -3051,15 +3505,10 @@ msgid "The specified directory could not be processed."
 msgstr "Das angegebene Verzeichnis konnte nicht bearbeitet werden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Keine Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Keine Bücher gefunden"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Hinzugefügt"
@@ -3166,6 +3615,14 @@ msgid ""
 "<p>Make sure that the folder you chose for your calibre library <b>is "
 "not</b> under the root folder you choose.</p>"
 msgstr ""
+"<p>Calibre kann Ihren Rechner automatisch nach vorhandenen Büchern "
+"durchsuchen. Diese Bücher werden dann in die Calibre Bibliothek "
+"<b>kopiert</b>. Dieser Assistent hilft bei der Anpassung der Suche und des "
+"Imports Ihrer bestehenden Büchersammlung.</p>\n"
+"<p>Wählen Sie einen Stammordner. Bücher werden nur in diesem Ordner und "
+"allen Unterordnern gesucht.</p>\n"
+"<p>Stellen Sie sicher, dass der Ordner, den Sie für Ihre Calibre Bibliothek "
+"auswählen, sich <b>nicht</b> unter dem gewählten Stammordner befindet.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
 msgid "&Root folder:"
@@ -3185,17 +3642,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3214,17 +3671,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3250,6 +3707,58 @@ msgstr ""
 "&Mehrere Bücher pro Verzeichnis, wobei jede Buch-Datei ein anderes Buch "
 "darstellt"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Pfad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formate"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr "Sammlungen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr "Zum Öffnen klicken"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Keine"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML Einstellungen"
@@ -3309,7 +3818,7 @@ msgstr "Ausgabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3327,8 +3836,8 @@ msgstr "eBook Einstellungen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -4053,11 +4562,6 @@ msgstr "Seitenverhältnis des Umschl&agbildes beibehalten"
 msgid "RB Output"
 msgstr "RB-Ausgabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Format zur Vorschau wählen"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -4145,12 +4649,12 @@ msgid "Footer regular expression:"
 msgstr "Regulärer Ausdruck Fußzeile:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Ungültiger regulärer Ausdruck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Ungültiger regulärer Ausdruck: %s"
 
@@ -4374,11 +4878,19 @@ msgstr ""
 "von XPath finden Sie im <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr "Cover-Browser konnte nicht geladen werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Umschlagbilder durchsuchen"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4399,236 +4911,266 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr "Stern(e)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr "Unbewertet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr "Alle Etiketten entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr "Etiketten hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr "Etiketten entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Keine weiteren Informationen verfügbar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "Gerät ist nicht mehr verbunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Geräteinformationen erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Liste der Bücher auf dem Gerät erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Anmerkungen vom Gerät laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Metadaten zum Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "%d Bücher auf das Gerät laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Bücher vom Gerät löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Bücher vom Gerät herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Buch auf dem Gerät ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Geben Sie die voreingestellte Übertragungsart an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "eMail an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr " und aus der Bibliothek löschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "An Hauptspeicher senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "An Speicherkarte A senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "An Speicherkarte B senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr "Hauptspeicher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr "Speicherkarte A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr "Speicherkarte B"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr "Übertragen und aus der Bibliothek löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Angegebenes Format übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr "Mit Verzeichnis verbinden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr "Von Verzeichnis trennen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "Anmerkungen abrufen (experimentell)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Fehler bei der Kommunikation mit dem Gerät"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr "Verzeichnis wählen, das als Gerät geöffnet werden soll"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Fehler in der Kommunikation zum Gerät"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
+"und schließen Sie das Gerät wieder an und - oder starten Sie neu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Gerät: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " gefunden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Angeschlossen: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "zum Übertragen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Format wählen, das ans Gerät geschickt wird"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Kein Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Keine Speicherkarte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Übertragung schlug fehl: Keine Speicherkarte im Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "Im Anhang finden Sie das eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "im %s Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Sende eMail an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Die folgenden Bücher vor dem Versenden per eMail automatisch konvertieren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Konnte die folgenden Bücher nicht versenden, da geeignete Formate fehlen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Senden der Bücher schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Senden der folgenden Bücher schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Per eMail versendet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Nachrichten:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Im Anhang ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Nachrichten senden an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Die folgenden Bücher vor dem Laden auf das Gerät automatisch konvertieren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Sende Kataloge ans Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Sende Nachrichten an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Sende Bücher an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -4637,49 +5179,33 @@ msgstr ""
 "fehlen. Konvertieren Sie die Bücher zuerst in ein von Ihrem Gerät "
 "unterstütztes Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Gerätespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
 "Gerätespeicher voll ist "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "Verfügbare Formate und deren Reihenfolge für dieses Gerät wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Unterverzeichnisse verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "Vor&lage speichern:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Pfad"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formate"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "Umschlagbild an Ansicht anpassen"
@@ -4833,152 +5359,156 @@ msgstr ""
 msgid "new email address"
 msgstr "Neue eMail-Adresse"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr "Breit"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr "Schmal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr "System-Port ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
+"Der Wert <b>%d</b>, den Sie für den Content Server Port gewählt haben, ist "
+"ein System Port. Ihr Betriebssystem erlaubt es <b>möglicherweise</b> nicht, "
+"dass der Server auf diesem Port läuft. Sie sind auf der sicheren Seite, wenn "
+"Sie eine Port Zahl größer als 1024 wählen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Fehler"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "Die Installation der Befehlszeilen-Tools schlug fehl."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "Kommandozeilen-Tools installiert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "Kommandozeilen-Tools installiert in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Wenn Sie Calibre.app verschieben, müssen Sie die Befehlszeilen-Tools neu "
 "installieren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "Kein gültiger Plugin-Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s ist kein gültiger Plugin-Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Plugin wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Plugin nicht anpassbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s bedarf keines Anpassens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Kann festinstalliertes Plugin nicht entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " kann nicht entfernt werden, da es ein festinstalliertes Plugin ist. "
 "Versuchen Sie, es auszuschalten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr "Sie müssen eine Spalte auswählen, um sie zu löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr "Die gewählte Spalte ist keine benutzerdefinierte Spalte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Wollen Sie wirklich die Spalte %s und ihre gesamten Daten löschen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Speicherort für Bücher wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "Die Größe %s ist ungültig. Sie muss der Form BreitexHöhe entsprechen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungültig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Muss ein Verzeichnis sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ortsangabe der Datenbank ungültig.<br>Speichern nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr "Neustart erforderlich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4986,19 +5516,19 @@ msgstr ""
 "Die gewählten Änderungen erfordern einen Neustart von Calibre. Bitte starten "
 "Sie baldmöglichst neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Überprüfe Vollständigkeit der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "Überprüfung der Vollständigkeit der Datenbank schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "Einige Inkonsistenzen gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5134,13 +5664,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "An das Gerät sen&den"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5149,29 +5680,29 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Benachrichtigung anzeigen, wenn &neue Version verfügbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "&Soziale Metadaten (Etikettierung/Bewertung/etc.) laden als Voreinstellung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "Autor und Titel standardmäßig überschreiben, wenn Metadaten geholt werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "Voreinstellung für Zei&tüberschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5179,140 +5710,148 @@ msgstr ""
 "Voreinstellung der Zeitüberschreitung für Netzwerkabrufe festsetzen (Gilt "
 "immer dann, wenn aus dem Internet Informationen abgerufen werden sollen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "Auftrags&priorität:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Bev&orzugtes Ausgabe-Format:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Bevorzugte Reihenfolge des E&ingabe-Formats:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "&Römische Ziffern für Reihennummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Be&nachrichtigungen im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
-msgstr ""
+msgstr "Spla&sh-Screen beim Starten anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zeige Cover-Ansicht in einem eigenen Fenster (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Suchen während der Eingabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Geladene &Nachrichten automatisch an das Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "Nachrichten nach der automatischen Übertragung auf das Gerät aus der "
 "Bibliothek &löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "A&nzahl der anzuzeigenden Umschlagbilder in der Cover-Ansicht (erfordert "
 "Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&Größe der Schaltflächen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Si&chtbare Spalten in Bibliothek-Ansicht wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr "Benutzerdefinierte Spalte entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr "Benutzerdefinierte Spalte hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr "Einstellungen einer benutzerdefinierten Spalte ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Internen &Viewer verwenden für:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr "Aussehen der Benutzeroberf&läche (Neustart erforderlich):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Eine eMail-Adresse hinzufügen, an die die Bücher gesendet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "eM&ail hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Als Voreinstellung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "eMail entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5322,35 +5861,35 @@ msgstr ""
 "eMails werden automatisch für geladene Nachrichten an alle eMail-Adressen "
 "mit aktiviertem Auto-Send verschickt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "&Maximale Anzahl der Arbeitsprozesse in der Warteschlange (erfordert "
 "Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "Vollständigkeit der &Datenbank überprüfen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "Kommandozeilen-Tools &installieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "&Calibre Einstellungsverzeichnis öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Die maximale Anzahl gleichzeitiger Aufträge auf die Anzahl der &CPU-Kerne "
 "beschränken."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "Fehlersuche bei &der Geräteerkennung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -5360,25 +5899,25 @@ msgstr ""
 "von überall aus mit Hilfe eines Browsers auf Ihre Büchersammlung zugreifen "
 "können. Einstellungsänderungen erfolgen erst nach einem Neustart des Servers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Ben&utzername:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5386,7 +5925,7 @@ msgstr ""
 "Wenn Sie das Kennwort leer lassen, kann jeder auf Ihre Büchersammlung über "
 "das Webinterface zugreifen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5394,45 +5933,45 @@ msgstr ""
 "Maximale Größe (BreitexHöhe) der angezeigten Umschlagbilder. Größere "
 "Umschlagbilder werden verkleinert. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Maximale Ums&chlagbild-Größe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "Maximale &ODPS Einträge pro Anfrage:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
-msgstr ""
+msgstr "Max. OPDS &ungeordnete Elemente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5450,7 +5989,7 @@ msgstr ""
 "vollständige Servername oder die IP-Adresse des Rechners sein, auf dem "
 "Calibre läuft."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5458,27 +5997,27 @@ msgstr ""
 "Hier können Sie das Verhalten von Calibrie anpassen, indem sie festlegen, "
 "welche Plugins verwendet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Plugin &ein-/ausschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "Plugin &anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "Plugin entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Neues Plugin hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Plugin-Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Hinzufügen"
 
@@ -5515,10 +6054,11 @@ msgid "Number"
 msgstr "Nummer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
 
@@ -5534,69 +6074,72 @@ msgstr "Erklärender Text hinzugefügt in create_ct_column.py"
 msgid "Create and edit tag-based columns"
 msgstr "Erstelle und bearbeite Etiketten-basierte Spalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr "Text, Spalte im Etiketten-Browser angezeigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 "Durch Kommata getrennter Text, wie Etiketten, angezeigt im Etiketten-Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr "Langer Text, wie Kommentare, nicht im Etiketten-Browser angezeigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr "Fließkommazahlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr "Ganzzahlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Bewertungen, angezeigt durch Sterne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr "Ja/Nein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr "Keine Spalte ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr "Es wurde keine Spalte ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr "Die gewählte Spalte ist keine benutzerdefinierte Spalte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "Es wurde kein Suchname angegeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
+"Die Beschriftung darf nur Buchstaben, Ziffern und Unterstriche enthalten und "
+"muss mit einem Buchstaben beginnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr "Es wurde keine Spaltenüberschrift angegeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr "Der Suchname %s wird schon verwendet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr "Die Überschrift %s wird schon verwendet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5621,11 +6164,15 @@ msgid ""
 "Used for searching the column. Must contain only digits and lower case "
 "letters."
 msgstr ""
+"Zur Verwendung für das Durchsuchen der Spalte. Darf nur Zahlen und "
+"kleingeschriebene Buchstaben enthalten."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
 msgid ""
 "Column heading in the library view and category name in the tag browser"
 msgstr ""
+"Spaltenüberschrift in der Bibliotheksansicht und Kategoriename im Etiketten-"
+"Browser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
 msgid "Column &type"
@@ -5633,7 +6180,7 @@ msgstr "Spalten&typ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
 msgid "What kind of information will be kept in the column."
-msgstr ""
+msgstr "Art der Information, die in der Spalte enthalten ist."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
 msgid ""
@@ -5645,6 +6192,13 @@ msgid ""
 "<li>dd MMMM yy gives 05 January 10</li>\n"
 "</ul> "
 msgstr ""
+"<p>Datumsformat. Verwenden Sie 1-4 'd's für den Tag, 1-4 'M's für den Monat, "
+"und 2 oder 4 'y's für das Jahr.</p>\n"
+"<p>Zum Beispiel:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy ergibt Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy ergibt 05 Januar 10</li>\n"
+"</ul> "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
 msgid "Use MMM yyyy for month + year, yyyy for year only"
@@ -5713,6 +6267,27 @@ msgstr "&Warnung erneut anzeigen"
 msgid "ERROR"
 msgstr "FEHLER"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Sortierung nach Autor"
@@ -5917,20 +6492,26 @@ msgid ""
 "\n"
 "Future conversion of these books will use the default settings."
 msgstr ""
+"Die gespeicherten Konvertierungs-Einstellungen für die gewählten Bücher "
+"löschen.\n"
+"\n"
+"Für zukünftige Konvertierungen dieser Bücher werden die Voreinstellungen "
+"verwendet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
 msgid "Remove &stored conversion settings for the selected books"
 msgstr ""
+"Ge&speicherte Konvertierungs-Einstellungen für die gewählten Bücher löschen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412
 msgid "&Basic metadata"
-msgstr ""
+msgstr "&Basis-Metadaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
 msgid "&Custom metadata"
-msgstr ""
+msgstr "Ben&utzerdefinierte Metadaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
 msgid "Not a valid picture"
@@ -5940,11 +6521,6 @@ msgstr "Kein gültiges Bild."
 msgid "Choose formats for "
 msgstr "Formate wählen für "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Bücher"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Zugriff verweigert"
@@ -5983,69 +6559,79 @@ msgstr "Das Umschlagbild im Format %s ist ungültig"
 msgid "Abort the editing of all remaining books"
 msgstr "Editieren aller verbleibenden Bücher abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Diese ISBN ist gültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Diese ISBN ist ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr "Kann Etiketteneditor nicht verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+"Der Etiketteneditor kann nicht verwendet werden, falls sie die Etiketten "
+"verändert haben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Lade Umschlagbild..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Kann kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Konnte kein Umschlagbild abrufen.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Der Download timed out."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "Konnte kein Umschlagbild für dieses Buch finden. Geben Sie zuerst die ISBN "
 "an."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Falsches Umschlagbild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Das Umschlagbild ist kein gültiges Bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Es sind Fehler aufgetreten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "Während des Ladens von sozialen Metadaten sind Fehler aufgetreten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Konnte Metadaten nicht abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "Sie müssen wenigstens ISBN, Titel, Autor oder Herausgeber angeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 "Konnte %s nicht öffnen. Wird es von einem anderen Programm verwendet?"
@@ -6141,14 +6727,16 @@ msgstr "Abbruch läuft ..."
 msgid ""
 "The current saved search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"Die aktuell gespeicherte Suche wird <b>dauerhaft gelöscht</b>. Sind Sie "
+"sicher?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
 msgid "Saved Search Editor"
-msgstr ""
+msgstr "Editor für gespeicherte Suche"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
 msgid "Saved Search: "
-msgstr ""
+msgstr "Gespeicherte Suche: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
 msgid "Select a saved search to edit"
@@ -6160,15 +6748,15 @@ msgstr "Löscht diese selektierte gespeicherte Suche"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
 msgid "Enter a new saved search name."
-msgstr ""
+msgstr "Einen neuen Namen für die gespeicherte Suche eingeben."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
 msgid "Add the new saved search"
-msgstr ""
+msgstr "Die neue gespeicherte Suche hinzufügen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
 msgid "Change the contents of the saved search"
-msgstr ""
+msgstr "Inhalt der gespeicherten Suche ändern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
@@ -6424,71 +7012,73 @@ msgid "Choose formats"
 msgstr "Formate auswählen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autoren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Herausgeber"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
 msgid " (not on any book)"
-msgstr ""
+msgstr " (in keinem Buch)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
 msgid ""
 "The current tag category will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"Die aktuelle Etiketten-Kategorie wird <b>dauerhaft gelöscht</b>. Sind Sie "
+"sicher?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
 msgid "User Categories Editor"
-msgstr ""
+msgstr "Editor für Benutzer-Kategorien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
-msgstr ""
+msgstr "&Verfügbare Elemente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
 msgid "Apply tags to current tag category"
-msgstr ""
+msgstr "Etiketten auf aktuelle Etiketten-Kategorie anwenden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
 msgid "A&pplied items"
-msgstr ""
+msgstr "An&gewandte Elemente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
 msgid "Unapply (remove) tag from current tag category"
-msgstr ""
+msgstr "Etikett aus aktueller Etiketten-Kategorie entfernen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
 msgid "Category name: "
-msgstr ""
+msgstr "Kategorie-Name: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
 msgid "Select a category to edit"
-msgstr ""
+msgstr "Kategorie zur Bearbeitung auswählen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
 msgid "Delete this selected tag category"
-msgstr ""
+msgstr "Die gewählte Etiketten-Kategorie löschen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
 msgid "Enter a new category name. Select the kind before adding it."
-msgstr ""
+msgstr "Neuen Kategorie-Namen eingeben. Art vor dem Hinzufügen auswählen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
 msgid "Add the new category"
-msgstr ""
+msgstr "Neue Kategorie hinzufügen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
 msgid "Category filter: "
-msgstr ""
+msgstr "Kategorie-Filter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
 msgid "Select the content kind of the new category"
-msgstr ""
+msgstr "Art des Inhalts der neuen Kategorie auswählen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:93
@@ -6550,22 +7140,24 @@ msgstr ""
 "zuweisen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr "Eintrag ist leer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
+"Ein Element kann nicht auf nichts eingestellt werden. Löschen Sie es "
+"stattdessen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
 msgid "Item already used"
-msgstr ""
+msgstr "Element wird schon verwendet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
 msgid "The item %s is already used."
-msgstr ""
+msgstr "Das Element %s wird schon verwendet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
 msgid "No item selected"
@@ -6574,6 +7166,7 @@ msgstr "Kein Eintrag ausgewählt"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
 msgid "You must select one item from the list of Available items."
 msgstr ""
+"Sie müssen ein Element aus der Liste der verfügbaren Elemente wählen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
 msgid "No items selected"
@@ -6581,31 +7174,33 @@ msgstr "Keine Einträge ausgewählt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
 msgid "You must select at least one items from the list."
-msgstr ""
+msgstr "Sie müssen wenigstens eines der Elemente aus der Liste auswählen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
 msgid "Are you certain you want to delete the following items?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie die folgenden Elemente löschen wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr "Kategorie-Editor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
-msgid "Items in use"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr "Elemente in Verwendung"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
+"Element aus der Datenbank löschen. Dies entfernt das Element von allen "
+"Büchern und löscht es dann aus der Datenbank."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
-msgstr ""
+msgstr "Element in jedem Buch, in dem es verwendet wird, umbenennen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr "Strg+S"
 
@@ -6884,11 +7479,11 @@ msgstr "Regulärer Ausdruck (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Kein Treffer"
 
@@ -6924,54 +7519,209 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulärer Ausdruck (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Speichere einzelnes Format auf Festplatte..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Metadaten einzeln bearbeiten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Metadaten auf einmal bearbeiten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Metadaten und Umschlagbilder laden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Nur Metadaten laden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Nur Umschlagbilder laden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Nur soziale Metadaten laden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "In das zuerst gewählte Buch zusammenführen - andere löschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "In das zuerst gewählte Buch zusammenführen - andere behalten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Bücher aus einem einzelnen Verzeichnis hinzufügen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen (ein "
+"Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
+"verschiedenen Formaten)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen "
+"(verschiedene Bücher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Leeres Buch hinzufügen. (Bucheintrag ohne Formate)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Auf Festplatte speichern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Nur das %s Format auf Festplatte speichern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+"Dur das %s Format in ein einzelnes Verzeichnis auf der Festplatte speichern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Vorschau"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Spezielles Format ansehen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Gewählte Bücher entfernen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Dateien des angegebenen Formates der gewählten Bücher entfernen..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Alle Formate der gewählten Bücher entfernen, außer..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Umschlagbilder der gewählten Bücher entfernen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Einzeln konvertieren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Auf einmal konvertieren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Erstelle Katalog der Bücher in der Calibre Bibliothek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Willkommens-Assistenten ausführen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Ähnliche Bücher..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr "Cover-Browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr "Etiketten-Browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr "Buchdetails"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Auftrag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Laufzeit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Es gibt %d laufende Aufträge:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Unbekannter Auftrag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Es gibt %d wartende Aufträge:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Kann Auftrag nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Kann Aufträge, die mit dem Gerät kommunizieren, nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Auftrag wird schon ausgeführt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Aufträge:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Aktive Aufträge anzeigen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Aufträge"
 
@@ -6983,112 +7733,90 @@ msgstr "N"
 msgid "Y"
 msgstr "J"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr "Auf dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Keine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Buch <font face=\"serif\">%s</font> von %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
-msgstr ""
+msgstr "Der Such-Name ist \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "In der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr "Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr "Sammlungen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr "Zum Löschen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr "Spalte %s ausblenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
-msgstr ""
+msgstr "Sortieren nach %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr "aufsteigend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr "absteigend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
-msgstr ""
+msgstr "Textausrichtung ändern für %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr "Links"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr "Rechts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr "Zentriert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr "Spalte anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
-msgstr ""
+msgstr "Voreingestelltes Layout wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Das ist nicht gestattet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7186,55 +7914,56 @@ msgstr "Information zur Fehlersuche auf die Konsole ausgeben"
 msgid "Do not check for updates"
 msgstr "Nicht nach Updates suchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
+msgid "Calibre Library"
+msgstr "Calibre Bibliothek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
 msgid "Choose a location for your calibre e-book library"
 msgstr "Wählen Sie einen Ort für Ihre Calibre eBook Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
 msgid "Failed to create library"
 msgstr "Das Erstellen der Bibliothek schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "Das Erstellen der Bibliothek schlug fehl in: %r. Abbruch."
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr "Erstellen der Calibre Bibliothek schlug fehl in: %r."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
+msgid "Choose a location for your new calibre e-book library"
+msgstr "Wählen Sie einen Ort für Ihre neue Calibre eBook Bibliothek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
 msgid "Initializing user interface..."
-msgstr ""
+msgstr "Starten der Benutzeroberfläche..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
 msgid "Repairing failed"
 msgstr "Reparatur schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
 "Die Reparatur der Datenbank schlug fehl. Es erfolgt ein Start mit einer "
 "neuen, leeren Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
-msgid "Calibre Library"
-msgstr "Calibre Bibliothek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
-msgid "Choose a location for your new calibre e-book library"
-msgstr "Wählen Sie einen Ort für Ihre neue Calibre eBook Bibliothek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr "Ungültiger Datenbank-Ort %r. Calibre beendet sich jetzt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "Beschädigte Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
@@ -7244,88 +7973,90 @@ msgstr ""
 "es automatisch zu reparieren? Wenn Sie Nein sagen, wird eine neue, leere "
 "Calibre Bibliothek erstellt werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 "Repariere Datenbank. Dies kann für eine große Büchersammlung einige Zeit "
 "dauern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 "Ungültiger Datenbank-Ort %r. Starte mit einer neuen, leeren Calibre "
 "Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
-msgstr ""
+msgstr "Starte %s: Lade Bücher..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Wenn Sie sicher sind, dass es nicht gestartet ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Start nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s ist schon gestartet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "kann im Systemtray gestartet sein, im"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "oberen rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "unteren rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "Versuchen Sie Ihren Rechner neu zu starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "Versuche Sie die Datei zu löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
-msgstr ""
+msgstr "Besch&ränken auf:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
+"Es werden nur die Bücher angezeigt, die auf die gewählte gespeicherte Suche "
+"zutreffen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "Einstellen in ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -7334,147 +8065,117 @@ msgstr ""
 "Kommentaren, etc.<br><br>Durch Leerzeichen getrennte Worte werden mit UND "
 "verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Quick Search löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 "Gespeicherte Suche wählen oder Namen für neue gespeicherte Suche eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Aktuellen Suchtext kopieren (anstelle des Namens der Suche)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Aktuelle Suche unter dem in der Box angezeigten Namen speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Aktuell gespeicherte Suche löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Nach Beliebtheit sortieren"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Übereinstimmung mit irgendeinem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Übereinstimmung mit allen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Bücher hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
-msgstr ""
+msgstr "Bucheinträge zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Auf Festplatte speichern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Vorschau"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Öffne Speicherort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Zeige Buchdetails"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Bücher desselben Autors"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Bücher dieser Reihe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Bücher dieses Herausgebers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Bücher mit denselben Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Calibre konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7507,14 +8208,34 @@ msgstr "Buch hat weder Titel noch ISBN"
 msgid "No matches found for this book"
 msgstr "Keine Treffer für dieses Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
-msgstr ""
+msgstr "Die gewählte Suche wird <b>dauerhaft gelöscht</b>. Sind Sie sicher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Suche (Zur erweiterten Suche die Schaltfläche links klicken)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchergebnisse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr "({0} von {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(Alle Bücher)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr "({0} von allen)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
@@ -7576,84 +8297,77 @@ msgstr "Löschen"
 msgid "&Alternate shortcut:"
 msgstr "&Alternatives Tastenkürzel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Aufträge:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Aktive Aufträge anzeigen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
-msgstr ""
+msgstr "Kategorie %s ausblenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
-msgstr ""
+msgstr "Kategorie anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
+msgstr "Alle Kategorien anzeigen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
-msgstr ""
+msgstr "Gespeicherte Suchen verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
-msgstr ""
+msgstr "Benutzer-Kategorien verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Suchergebnisse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Such-Name duplizieren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "Der gespeicherte Such-Name %s wird schon verwendet."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Übereinstimmung mit allen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Übereinstimmung mit irgendeinem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "Ben&utzer-Kategorien verwalten"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7697,613 +8411,63 @@ msgstr ""
 "Die folgenden Bücher wurden schon in das %s Format konvertiert. Möchten Sie "
 "sie erneut konvertieren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Speichere einzelnes Format auf Festplatte..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Suche (Zur erweiterten Suche die Schaltfläche links klicken)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchergebnisse"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Fehler bei der Kommunikation mit dem Gerät"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "Spen&den Sie, um Calibre zu unterstützen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "Verbundenes Gerät ausw&erfen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Neustart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Hilfe finden Sie in der <a href=\"%s\">Bedienungsanleitung</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s von <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Metadaten einzeln bearbeiten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Metadaten auf einmal bearbeiten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Metadaten und Umschlagbilder laden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Nur Metadaten laden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Nur Umschlagbilder laden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Nur soziale Metadaten laden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "In das zuerst gewählte Buch zusammenführen - andere löschen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "In das zuerst gewählte Buch zusammenführen - andere behalten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Bücher aus einem einzelnen Verzeichnis hinzufügen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen (ein "
-"Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
-"verschiedenen Formaten)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen "
-"(verschiedene Bücher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Leeres Buch hinzufügen. (Bucheintrag ohne Formate)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Nur das %s Format auf Festplatte speichern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Spezielles Format ansehen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Gewählte Bücher entfernen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Dateien des angegebenen Formates der gewählten Bücher entfernen..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Alle Formate der gewählten Bücher entfernen, außer..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Umschlagbilder der gewählten Bücher entfernen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Einzeln konvertieren"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Auf einmal konvertieren"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Erstelle Katalog der Bücher in der Calibre Bibliothek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Willkommens-Assistenten ausführen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Ähnliche Bücher..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre Quick-Start-Guide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Umschlagbilder durchsuchen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr "({0} von {1})"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(Alle Bücher)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr "({0} von allen)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Gerät: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " gefunden."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Angeschlossen: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Gerätedatenbank ist beschädigt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>Die Bücherdatenbank des Gerätes ist beschädigt. Versuchen "
-"Sie folgendes:\n"
-"                <ol>\n"
-"                <li>Entfernen Sie das Gerät. Warten Sie, bis das Gerät die "
-"Datenbank wiederhergestellt hat (d.h. warten Sie, bis das Gerät wieder "
-"benutzt werden kann). Stecken Sie das Gerät wieder an. Nun sollte es mit "
-"%(app)s funktionieren. Falls nicht, versuchen Sie den nächsten "
-"Schritt.</li>\n"
-"                <li>Schließen Sie %(app)s. Suchen Sie die Datei media.xml im "
-"Hauptspeicher des Gerätes. Löschen Sie sie. Entfernen Sie das Gerät. Warten "
-"Sie, bis das Gerät die Datei wiederhergestellt hat. Stecken Sie das Gerät "
-"wieder an und starten Sie %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Nur Bibliothek verwenden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "Nur aus der Hauptbibliothek erstellte Benutzeranmerkungen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Keine Bücher ausgewählt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr "Es sind keine Bücher zum Abrufen von Anmerkungen ausgewählt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "Füge Benutzeranmerkungen zur Datenbank hinzu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Letzte gelesene Seite: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Letzte gelesene Seite: Position %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Position %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Seite %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Position %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "Wie viele leere Bücher?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "Wie viele leere Bücher sollen hinzugefügt werden?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Lade Bücher auf das Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr "Topaz Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Text Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Comics"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Archive"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "Unterstützte Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "Einige Bücher zusammenfügen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Es wurden einige Duplikate gefunden und mit den folgenden, schon vorhandenen "
-"Büchern zusammengefügt:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Lesen der Metadaten schlug fehl"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Lesen der Metadaten schlug fehl bei folgenden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "Löschen nicht möglich"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Kein Buch ausgewählt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "Zu löschende Formate auswählen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "<b>Nicht</b> zu löschende Formate auswählen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Die gewählten Bücher werden <b>dauerhaft gelöscht</b> und die Dateien vom "
-"Computer entfernt. Sicher?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Lösche Bücher vom Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Konnte Metadaten nicht laden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "soziale Metadaten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "Umschlagbilder"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "Metadaten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Lade %s für %d Bücher"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Das Laden der Metadaten schlug teilweise fehl"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Das Laden der Metadaten schlug für folgende Bücher fehl:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Laden der Metadaten schlug fehl:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Kann Metadaten nicht bearbeiten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "Konnte Bücher nicht zusammenfügen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Es müssen wenigstens zwei Bücher zum Zusammenfügen ausgewählt werden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-"Alle Buchformate und Metadaten des gewählten Buches werden zum <b>zuerst "
-"gewählten Buch</b> hinzugefügt.<br><br> Das zweite und danach gewählte "
-"Bücher werden nicht gelöscht oder verändert.<br><br>Zum Fortfahren bitte "
-"bestätigen."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-"Alle Buchformate und Metadaten des gewählten Buches werden zum <b>zuerst "
-"gewählten Buch</b> hinzugefügt.<br><br>Nach dem Zusammenfügen werden das "
-"zweite und danach gewählte Bücher <b>gelöscht</b>. <br><br>Alle Buchformate "
-"des zuerst gewählten Buches bleiben bestehen und alle doppelten Formate im "
-"zweiten und den danach gewählten Bücher werden unwiderruflich von Ihrem "
-"Rechner <b>gelöscht</b>.<br><br>  Wollen Sie <b>wirklich</b> fortfahren?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Sie versuchen mehr als 5 Bücher zusammenzufügen. Wollen Sie damit "
-"<b>wirklich</b> fortfahren?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Speichern auf Festplatte nicht möglich"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Zielverzeichnis auswählen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Fehler während des Speicherns"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Es gab einen Fehler während des Speicherns."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Konnte einige Bücher nicht speichern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-"Klicken Sie auf die Schaltfläche Details zeigen, um zu sehen, welche es gibt."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "Keine Bücher ausgewählt, für die ein Katalog erstellt werden soll"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Erstelle %s Katalog..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr "Keine Bücher im Katalog. Bitte ausgeschlossene Etiketten prüfen."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Katalog erstellt."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "Katalog-Verzeichnis exportieren"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "Wählen Sie das Ziel für %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Rufe Nachrichten ab von "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " abgerufen."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Konvertierung nicht möglich"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "Starte Konvertierung von %d Büchern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Ansehen nicht möglich"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Mehrere Bücher ausgewählt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-"Sie versuchen %d Bücher zu öffnen. Das gleichzeitige Öffnen zu vieler Bücher "
-"kann lange dauern und einen negative Wirkung auf die Reaktionszeit Ihres "
-"Rechners haben. Einmal gestartet kann der Prozess nicht beendet werden, "
-"bevor er abgeschlossen ist. Möchten Sie fortfahren?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Konnte Verzeichnis nicht öffnen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s hat keine verfügbaren Formate."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht möglich während Aufträge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
-msgstr ""
+msgstr "Konfiguration erst nach einem Neustart von Calibre möglich."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Es sind keine weitere Informationen über Bücher auf dem Gerät verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr "Fehlgeschlagen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Fehler in der Kommunikation zum Gerät"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
-"und schließen Sie das Gerät wieder an und - oder starten Sie neu."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8312,15 +8476,15 @@ msgstr ""
 "href=\"%s\">DRM</a> geschütztes Buch. Sie müssen zuerst das DRM mit Hilfe "
 "anderer Programme entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Downloadschema ausgeschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -8329,12 +8493,12 @@ msgstr ""
 "Falls Sie es nützlich finden, sollten Sie eine Spende zur Unterstützung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive Aufträge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8345,11 +8509,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8357,7 +8521,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum Schließen wählen Sie <b>Beenden</b> "
 "im Kontextmenü des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8365,11 +8529,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Neue Version verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8852,15 +9016,15 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "eBook drucken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Bild kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Bild einfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8870,7 +9034,7 @@ msgstr ""
 "%d\n"
 "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8880,7 +9044,7 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8890,7 +9054,7 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8900,49 +9064,61 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Liste der auf dem Computer vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 "Liste der auf dem Hauptspeicher des Gerätes vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 "Liste der auf der Speicherkarte A des Gerätes vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 "Liste der auf der Speicherkarte B des Gerätes vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
-msgstr ""
+msgstr "Bücher finden sich in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Groß-/Kleinschreibung ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Großschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Kleinschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Groß-/Kleinschreibung vertauschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Wortanfänge groß schreiben"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr "Zur Größenänderung ziehen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr "Anzeigen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr "Ausblenden"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9251,48 +9427,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "&Inhalt-Server einschalten"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr "heute"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr "gestern"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr "in diesem Monat"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr "vor Tagen"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr "nein"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr "nicht ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr "ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr "ja"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr "leer"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr "leer"
 
@@ -9824,7 +10000,7 @@ msgstr ""
 "Default: no filtering"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Detaillierte Ausgabeinformation anzeigen. Hilfreich zur Fehlersuche."
 
@@ -9939,43 +10115,47 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr "Haupt"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr "Karte A"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr "Karte B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "Überprüfe SQL Vollständigkeit..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "Überprüfe fehlende Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "Überprüfte ID"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Bewertungen"
 
@@ -10175,6 +10355,10 @@ msgid ""
 "more than this number of items. Default: %default. Set to a large number to "
 "disable grouping."
 msgstr ""
+"Elemente in Kategorien wie Autoren / Etiketten nach dem ersten Buchstaben "
+"gruppieren, wenn es mehr als diese Anzahl von Elementen gibt. "
+"Voreinstellung: %default. Zum Ausschalten der Gruppierung auf eine große "
+"Zahl einstellen."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
@@ -10200,43 +10384,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr "Prozess PID in die angegebene Datei schreiben"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr "%d Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr "%d Einträge"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "BEWERTUNG: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr "ETIKETTEN: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "REIHEN: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Bücher in Ihrer Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr "Von "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr "Bücher sortiert nach "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr "Neuestes"
 
@@ -10312,7 +10496,7 @@ msgstr "Liste der benannten gespeicherten Suchen"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:700
 msgid "User-created tag browser categories"
-msgstr ""
+msgstr "Benutzererstellte Etiketten-Browser Kategorieen"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10383,34 +10567,38 @@ msgid "English (Pakistan)"
 msgstr "Englisch (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Englisch (Singapur)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "Englisch (Jemen)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "Englisch"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Englisch (China)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Spanisch (Paraguay)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Deutsch (AT)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Holländisch (NL)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Holländisch (BE)"
 
@@ -10473,93 +10661,93 @@ msgstr ""
 "Letzte Version der vorgegebenen Downloadschemata nicht vom Calibre Server "
 "laden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 "Das \"%s\" Downloadschema benötigt einen Benutzernamen und ein Passwort."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Der Download der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Der Download von Teilen der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene Verknüpfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Konnte Artikel nicht abrufen. Mit -vv starten, um den Grund dafür zu sehen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Feeds der Index-Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Umschlagbild versuchen heruterzuladen ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "Erstelle Impressum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Download von [%d Thread(s)] starten ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Umschlagbild konnte nicht heruntergeladen werden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Umschlagbild von %s herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "Impressumskopie geladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Artikel heruntergeladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Herunterladen der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Feed abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10567,7 +10755,7 @@ msgstr ""
 "Login fehlgeschlagen, überprüfen Sie ihren Benutzername und Passwort für den "
 "calibre Magazin Service."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10591,7 +10779,7 @@ msgstr "Geplant"
 msgid "Custom"
 msgstr "Angepasst"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10601,13 +10789,13 @@ msgstr ""
 "\n"
 "URL ist z.B. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Grundverzeichnis, in das die URL gespeichert wird. Voreinstellung ist "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10615,7 +10803,7 @@ msgstr ""
 "Timeout in Sekunden beim Warten auf eine Antwort vom Server. Voreinstellung: "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10623,7 +10811,7 @@ msgstr ""
 "Maximale Zahl von einbezogenen Ebenen, z.B. Tiefe der Links, die verfolgt "
 "werden. Voreinstellung %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10631,7 +10819,7 @@ msgstr ""
 "Höchstzahl der Dateien, die geladen werden. Dies trifft nur auf Dateien aus "
 "<a href> Tags zu. Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10639,7 +10827,7 @@ msgstr ""
 "Kleinstes Intervall in Sekunden zwischen aufeinander folgenden Abrufen. "
 "Voreinstellung ist %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10647,7 +10835,7 @@ msgstr ""
 "Zeichenkodierung für Webseiten, die zu laden versucht werden. In der "
 "Voreinstellung wird versucht, die Kodierung zu erraten."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -10658,7 +10846,7 @@ msgstr ""
 "sie einem regulären Ausdruck entsprechen. In der Voreinstellung werden alle "
 "Links verfolgt."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10672,7 +10860,7 @@ msgstr ""
 "Links ignoriert. Falls beide --filter-regexp und --match-regexp angegeben "
 "sind, wird --filter-regexp zuerst angewendet."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "CSS-Stylesheets nicht herunterladen."
 
@@ -11169,6 +11357,39 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "Send to storage card"
 #~ msgstr "An Speicherkarte senden"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Gerätedatenbank ist beschädigt"
+
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>Die Bücherdatenbank des Gerätes ist beschädigt. Versuchen "
+#~ "Sie folgendes:\n"
+#~ "                <ol>\n"
+#~ "                <li>Entfernen Sie das Gerät. Warten Sie, bis das Gerät die "
+#~ "Datenbank wiederhergestellt hat (d.h. warten Sie, bis das Gerät wieder "
+#~ "benutzt werden kann). Stecken Sie das Gerät wieder an. Nun sollte es mit "
+#~ "%(app)s funktionieren. Falls nicht, versuchen Sie den nächsten "
+#~ "Schritt.</li>\n"
+#~ "                <li>Schließen Sie %(app)s. Suchen Sie die Datei media.xml im "
+#~ "Hauptspeicher des Gerätes. Löschen Sie sie. Entfernen Sie das Gerät. Warten "
+#~ "Sie, bis das Gerät die Datei wiederhergestellt hat. Stecken Sie das Gerät "
+#~ "wieder an und starten Sie %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid ""
 #~ "<p>Books with the same title as the following already exist in the database. "
 #~ "Add them anyway?<ul>"
@@ -11753,6 +11974,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "The series index"
 #~ msgstr "Serienindex"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Liste der Etiketten nach Beliebtheit sortieren"
+
 #~ msgid "Read &metadata from files"
 #~ msgstr "&Metadaten aus Dateien lesen"
 
@@ -11768,6 +11992,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "Level &2 TOC"
 #~ msgstr "Ebene &2 Inhaltsverzeichnis"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Nach Beliebtheit sortieren"
+
 #~ msgid "Set defaults for conversion of comics"
 #~ msgstr "Voreinstellungen für die Konvertierung von Comics eingeben"
 
@@ -13074,3 +13301,15 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ "Der für den Content-Server gewählte Port <b>%d</b> ist ein System-Port. Ihr "
 #~ "Betriebssystem <b>könnte</b> nicht zulassen, dass der Server auf diesem Port "
 #~ "läuft. Um sicher zu gehen, wählen Sie eine Port-Nummer größer als 1024."
+
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr "Das Erstellen der Bibliothek schlug fehl in: %r. Abbruch."
+
+#~ msgid "Rename"
+#~ msgstr "Umbenennen"
+
+#~ msgid "Side bar"
+#~ msgstr "Seitenleiste"
+
+#~ msgid "Manage "
+#~ msgstr "Verwalten "
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index 75cb278f4d..b185ba107c 100644
--- a/src/calibre/translations/es.po
+++ b/src/calibre/translations/es.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-09 18:23+0000\n"
-"Last-Translator: Jellby <Unknown>\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:14+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\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: 2010-06-10 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -28,7 +28,7 @@ msgstr ""
 "Este perfil está pensado para la línea PRS de SONY. Los 500/505/700, etc., "
 "en modo apaisado. Útil principalmente para cómics."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil está pensado para el Kindle DX de Amazon."
 
@@ -42,12 +42,12 @@ msgstr "No hace absolutamente nada"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -59,22 +59,22 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -120,44 +120,46 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -314,62 +316,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Este perfil está pensado para el SONY PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Este perfil está pensado para el SONY PRS-900"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Este perfil está pensado para el Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Este perfil está pensado para los libros Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Este perfil está pensado para el Hanlin V3 y sus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Este perfil está pensado para el Hanlin V5 y sus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Este perfil está pensado para el Cybook Gen3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Este perfil está pensado para el Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Este perfil está pensado para el Kindle de Amazon"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Este perfil está pensado para el Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Este perfil está pensado para el IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Este perfil está pensado para el IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfile está pensado para el Nook de B&N."
 
@@ -397,11 +399,11 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Este perfil está pensado para el lector Kobo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Este perfil está pensado para el SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Este perfil está pensado para el JetBook de 5 pulgadas."
 
@@ -417,16 +419,20 @@ msgstr "Personalización del complemento local"
 msgid "Disabled plugins"
 msgstr "Complementos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "No se ha encontrado ningún complemento válido en "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 "La inicialización del complemento %s falló y generó la siguiente traza:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -438,18 +444,18 @@ msgstr ""
 "    Personalizar calibre cargando complementos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Añadir un complemento especificando la ruta al archivo ZIP que lo contiene."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Eliminar un complemento personalizado por nombre. No tiene efecto en los "
 "complementos incorporados."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -457,15 +463,15 @@ msgstr ""
 "Personalizar complemento. Especifica el nombre del complemento y el texto de "
 "personalización separados por una coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Lista de todos los complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Activar el complemento nombrado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Desactivar el complemento nombrado"
 
@@ -481,38 +487,37 @@ msgstr ""
 "Lista de directorios, separados por comas, donde almacenar los libros en el "
 "dispositivo. Se usará el primero que exista"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Comunicarse con iBooks a través de iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Dispositivo Apple detectado. Iniciando iTunes. Un momento, por favor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Actualizando listado de meta datos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "terminado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -522,17 +527,17 @@ msgstr ""
 "Bórrelos utilizando la aplicación iBooks.\n"
 "Pulse \"Mostrar Detalles\" para ver una lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "configuraciones de controladores de dispositivos"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Lista ordenada de formatos que el dispositivo aceptará"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -540,6 +545,18 @@ msgstr ""
 "Algunas portadas no pudieron ser convertidas.\n"
 "Pulsar en \"Mostrar Detalles\" para ver una lista."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Noticias"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Comunicar con el lector Binatone Readme."
@@ -562,6 +579,10 @@ msgstr "Comunicarse con el lector Cybook Gen 3 / Opus."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Comunicar con el lector EB600"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Equipo de expertos"
@@ -574,6 +595,10 @@ msgstr "Comunicarse con el equipo de expertos."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Comunicar con el lector ESlick"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Comunicarse con el lector de libros electrónicos Sigmatek"
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -588,14 +613,20 @@ msgstr "Interfaz del dispositivo"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Comunicar con los lectores Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Comunicar con los lectores Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunicar con el lector BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Comunicar con el lector Hanvon N520"
@@ -622,7 +653,7 @@ msgstr "Comunicar con el lector IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -642,15 +673,15 @@ msgstr "Comunicar con el lector Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Comunicarse con el lector JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Comunicarse con el lector Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Comunicarse con el lector Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Comunicarse con el lector Kindle DX."
 
@@ -694,7 +725,7 @@ msgstr "Comunicar con el lector Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunicarse con todos los lectores Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -702,7 +733,7 @@ msgstr ""
 "Lista (separada por comas) de campos de metadatos para convertir en "
 "colecciones en el dispositivo. Las posibilidades son: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Sin nombre"
@@ -723,25 +754,25 @@ msgstr "Comunicarse con el lector Newsmy."
 msgid "Communicate with the iPapyrus reader."
 msgstr "Comunicarse con el lector iPapyrus."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 "No se pudo detectar la unidad de disco %s. Pruebe después de reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "No se puede detectar el punto de montaje %s. Inténtelo tras reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "No se pudo detectar la unidad de disco %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "No se pudo encontrar el asistente de montaje: %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -749,39 +780,28 @@ msgstr ""
 "No se pudo detectar la unidad de disco %s. Probablemente el kernel está "
 "exportando una versión anticuada de SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "No se pudo montar la memoria principal (Código de error: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "El lector no tiene tarjeta de almacenamiento en esta ranura."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "La ranura seleccionada: %s no está soportada."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "No hay suficiente espacio libre en la memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "No hay suficiente espacio libre en la tarjeta de almacenamiento"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Noticias"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Configurar dispositivo"
@@ -791,57 +811,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Colocar los archivos en subdirectorios si el dispositivo los soporta"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Leer los metadatos de los archivos del dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Plantilla para controlar cómo se guardan los libros"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Personalización adicional"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Comunicar con un lector de libros electrónicos."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Obtener información del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Obteniendo la lista de libros en el dispositivo ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Transfiriendo libros al dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Añadiendo libros al listado de metatados del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Eliminando libros del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros del listado de metatados del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Enviando metadatos al dispositivo..."
 
@@ -1601,15 +1625,15 @@ msgstr "El índice en la serie y la valoración deben ser números. Se ignoran"
 msgid "Failed to parse date/time"
 msgstr "No se ha podido analizar la fecha/hora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Convirtiendo entrada a HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Aplicando transformaciones al libro electrónico..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Creando"
 
@@ -1978,84 +2002,88 @@ msgstr "Tipo de letra monoespaciada a incrustar."
 msgid "Comic"
 msgstr "Cómic"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Editorial"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Productor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Comentarios"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Derechos"
 
@@ -2063,7 +2091,7 @@ msgstr "Derechos"
 msgid "EDITORIAL REVIEW"
 msgstr "REVISIÓN EDITORIAL"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2187,6 +2215,10 @@ msgstr "Portada guardada en"
 msgid "No cover found"
 msgstr "No se encontro ninguna portada"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Metadatos descargados"
@@ -2227,6 +2259,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Descarga metadatos sociales de amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2302,7 +2338,7 @@ msgstr ""
 "Obtener una portada para el libro identificado por el ISBN en "
 "LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Portada"
@@ -2631,6 +2667,8 @@ msgstr ""
 "Obtener información sobre un PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2899,8 +2937,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Usar números romanos para los número de series"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Ordenar la lista de etiquetas por popularidad"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2982,23 +3020,438 @@ msgstr "Limitar el número de tareas al número de CPU"
 msgid "tag browser categories not to display"
 msgstr "Categorías del explorador de etiquetas que no se mostrarán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "El diseño de la interfaz de usuario"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Copiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Copiar al portapapeles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Escoger ficheros"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Usar sólo la biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "Usar anotaciones generadas sólo desde la biblioteca principal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "No hay libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "No se han seleccionado libros desde los que obtener anotaciones"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "Mezclando anotaciones de usuario en la base de datos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Última página leída: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Última página leída: Localizada en %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Lugar %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Page %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Lugar %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "¿Cuantos libros vacios?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "¿Cuantos libros vacios debe de estar aumentado?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Enviando libros al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "Libros en EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "Libros en LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "Libros en HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "Libros en LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "Libros en MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Libros en formato topaz"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Libros en formato texto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "Libros en PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Cómics"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Archivos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Libros soportados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Se han unido algunos libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Se han encontrado algunos libros duplicados y se han unido a los siguientes "
+"libros existentes:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Fallo leyendo metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Fallo leyendo metadatos de"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "No hay libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "No se puede borrar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Elegir formatos a borrar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Elegir formatos que <b>no</b> hayan de ser borrados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr "Tarjeta de almacenamiento A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr "Tarjeta de almacenamiento B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Eliminando libros del dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Los libros seleccionados serán <b>eliminados permanentemente</b> y los "
+"ficheros borrados del equipo. ¿Está seguro?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"Los libros seleccionados se <b>borrarán permanentemente</b> del dispositivo. "
+"¿Está seguro?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "No se pueden descargar los metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "metadatos sociales"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "portadas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Descargando %s para %d libro(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "No se pudieron descargar algunos metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "No se pudieron descargar metadatos para:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "No se pudieron descargar metadatos:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Error"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "No se pueden editar los metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "No se pueden unir los libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Deben seleccionarse al menos dos libros para unirlos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Todos los formatos y metadatos de los libros seleccionados se añadirán al "
+"<b>primer libro seleccionado</b>.<br><br>El segundo libro y los siguientes "
+"no se borrarán ni se modificarán.<br><br>Confirme que quiere continuar."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Todos los formatos y metadatos de los libros seleccionados se añadirán al "
+"<b>primer libro seleccionado</b>.<br><br>Después el segundo libro y los "
+"siguientes se <b>borrarán</b>.<br><br>Todos los formatos del primer libro "
+"seleccionado se mantendrán y cualquier formato duplicado en los otros libros "
+"se <b>borrará</b> de forma permanente de su ordenador.<br><br>¿Está "
+"<b>seguro</b> de que quiere continuar?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Va a unir más de 5 libros. ¿Está <b>seguro</b> de que quiere continuar?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "No se puede guardar en disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Elegir directorio de destino"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Error al guardar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Hubo un error al guardar."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "No se pudieron guardar algunos libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Pulse el botón \"Mostrar detalles\" para ver cuáles."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "No se han seleccionado libros para generar el catálogo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Generando catálogo %s..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "No se encontró ningún libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"No hay libros para incluir en el catálogo\n"
+"Compruebe la exclusión de etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Catálogo generado."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Directorio para exportar catálogos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Seleccionar destino para %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Obteniendo noticias de "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " obtenidas."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "No se puede convertir"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Iniciando la conversión de %d libro(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "No se puede visualizar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Elija el formato para visualizar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Varios libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+"Está intentando abrir %d libros. Abrir demasiados libros a la vez puede "
+"resultar lento y tener un efecto negativo sobre el funcionamiento del "
+"equipo. Una vez comenzado el proceso no puede deterse hasta que se complete. "
+"¿Desea continuar?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "No se puede abrir la carpeta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s no tiene formatos disponibles."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Buscando en"
@@ -3020,15 +3473,10 @@ msgid "The specified directory could not be processed."
 msgstr "El directorio especificado no se puede procesar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Sin libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "No se encontró ningún libro"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Añadido"
@@ -3161,17 +3609,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3190,17 +3638,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3226,6 +3674,58 @@ msgstr ""
 "&Varios libros por carpeta. Se supone que cada fichero de libro es un libro "
 "diferente"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Ruta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr "Colecciones"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr "Clic para abrir"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Ninguno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "Opciones CSV/XML"
@@ -3285,7 +3785,7 @@ msgstr "salida"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3303,8 +3803,8 @@ msgstr "Opciones de libro digital"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Catálogo"
 
@@ -4026,11 +4526,6 @@ msgstr "Mantener relación de &aspecto de la portada"
 msgid "RB Output"
 msgstr "Salida RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Elija el formato para visualizar"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -4117,12 +4612,12 @@ msgid "Footer regular expression:"
 msgstr "Expresión regular para pies de página:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Expresión regular no válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Expresión regular no valida: %s"
 
@@ -4344,11 +4839,19 @@ msgstr ""
 "<p>Para usos más avanzados de XPath, véase el <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">Tutorial de XPathl</a>.</p>"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr "No se ha podido cargar el navegador de carátulas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Explorar por portadas"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4369,239 +4872,269 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr "estrella(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr "Sin calificar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr "Eliminar todas las etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr "etiquetas a añadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr "etiquetas a eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "No hay detalles disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "El dispositivo ya no esta conectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Obtener información del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Obtener lista de libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Obtener anotaciones del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Enviar metadatos al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Pasar %d libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Borrar libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Obtener libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Ver libro en el dispositvo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Asignar acción de enviar al dispositivo por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "Enviar por correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr " y elimínalo desde la librería"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Enviar a la memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Enviar a la tarjeta de memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Enviar a la tarjeta de memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr "Memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr "Tarjeta de almacenamiento A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr "Tarjeta de almacenamiento B"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr "Enviar y eliminar de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Enviar formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr "Conectar a carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr "Desconectar de la carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "Obtener anotaciones (experimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Error en la comunicación con el dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr "Seleccionar carpeta para abrir como un dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr "Falló"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Error de comunicación con el dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Hubo un error de comunicación con el dispositivo. Desconecte y vuelva a "
+"conectar el dispositivo o reinicie la aplicación."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " detectado."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "elegido para enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Elige el formato para enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Sin dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "No se pudo enviar: no hay ningún dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Sin tarjeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "No se pudo enviar: el dispositivo no tiene tarjeta de memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "Libro electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "El libro electrónico está adjunto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "en el formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Enviando correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "No hay formatos adecuados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de enviar por correo "
 "electrónico?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "No se pudieron enviar por correo electrónico los siguientes libros porque no "
 "se encontraron formatos compatibles:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Fallo al enviar libros por correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Fallo al enviar por correo electrónico los siguientes libros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Enviado por correo electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Noticias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Adjunto está el"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Enviar noticias a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de pasarlos al "
 "dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Enviando noticias al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Enviando libros al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -4610,51 +5143,35 @@ msgstr ""
 "encontraron formatos adecuados. Convierta el(los) libro(s) a un formato "
 "soportado por su dispositivo antes de volver a intentarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "No hay espacio en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>No se pueden pasar los libros porque no hay más espacio libre en el "
 "dispositivo "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 "Seleccionar los formatos disponibles y su orden de preferencia para este "
 "dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Usar subdirectorios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "Guardar &template:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Ruta"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formatos"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "&Ajustar la portada a la ventana"
@@ -4812,11 +5329,19 @@ msgstr ""
 msgid "new email address"
 msgstr "nueva dirección de correo electrónico"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr "Ancho"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr "Estrecho"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr "Puerto de sistema seleccionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -4827,139 +5352,131 @@ msgstr ""
 "permita que el servidor ocupe este puerto. Para estar seguro, elija un "
 "número de puerto mayor de 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Error"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "Fallo al instalar las herramientas de línea de órdenes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "Herramientas de línea de órdenes instaladas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "Herramientas de línea de órdenes instaladas en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Si mueve calibre.app, deberá reinstalar las herramientas de línea de órdenes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "No hay ninguna ruta de complementos válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s no es una ruta de complementos válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Elegir complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "El complemento no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "El complemento: %s no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Complemento no personalizable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Complemento: %s no necesita personalización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "No se puede eliminar el complemento incorporado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " no puede eliminarse. Es un complemento incorporado. Intente desactivarlo en "
 "su lugar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr "Debe seleccionar una columna para borrarla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr "La columna seleccionada no es una columna personalizada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "¿Seguro que quiere borrar la columna %s y todos sus datos?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Registro de errores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Registro de accesos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Fallo al iniciar el servidor de contenidos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Seleccionar ubicación para los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Tamaño no válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "El tamaño %s no es válido. Debe ser de la forma anchuraxaltura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Ubicación de la base de datos no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Ubicación de la base de datos no válida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Debe ser un directorio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ubicación de la base de datos no válida.<br>Imposible escribir en "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr "Hay que reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4967,19 +5484,19 @@ msgstr ""
 "Los cambios realizados requieren que calibre vuelva a iniciarse. Por favor "
 "reinicie en cuanto le sea práctico."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Comprobando la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "Fallo al comprobar la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "Se encontraron incoherencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5116,13 +5633,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Enviar a &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5131,28 +5649,28 @@ msgstr ""
 "en carpetas ordenadas por autor, los metadatos se almacenan en el fichero "
 "metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Seleccionar la nueva ubicación de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Mostrar un aviso cuando haya una &nueva versión disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "Descargar metadatos &sociales (etiquetas/valoraciones/etc...) por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Reemplazar el autor y el título al adquirir metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "&Tiempo de espera máximo por defecto de la red:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5160,140 +5678,148 @@ msgstr ""
 "Establecer el tiempo de espera maximo para peticiones de red (cada vez que "
 "se conecte a Internet para adquirir alguna información)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Se&leccionar idioma (requiere reiniciar el programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Baja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Prioridad de tareas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "F&ormato de salida preferente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Orden de preferenc&ia de formatos de entrada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Uso de números &romanos para los números dentro de una serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar &icono en bandeja del sistema (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Mostrar &noticaciones en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr "Mostrar pantalla de bien&venida al inicio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Mostrar explorador de &portadas en ventana separada (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "&Buscar mientras se escribe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 "Enviar noticias &descargadas automáticamente al lector de libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Eliminar noticias de la biblioteca cuando se hayan enviado automáticamente "
 "al lector."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Nú&mero de portadas a mostrar en el explorador (requiere reinicio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Pequeño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "Tamaño de botón en la barra de &herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Mostrar &texto en los botones de la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Seleccione las &columnas visibles en la vista de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr "Eliminar una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr "Añadir una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr "Editar la configuración de una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "&Usar visor interno para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr "Interfaz de usuario &diseño (necesario reiniciar):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 "Añadir una dirección de correo electrónico a la que se enviarán los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "&Añadir correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Asignar como pre&determinada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "E&liminar correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5303,33 +5829,33 @@ msgstr ""
 "Se enviarán correos automáticamente con las noticias descargadas a todas las "
 "direcciones que tengan la opción de envío automático marcada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Número máximo de procesos en espera (necesita reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "&Comprobar la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "Instalar &herramientas de línea de órdenes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "&Abrir el directorio de configuración de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "&Limitar el número máximo de tareas simultáneas al número de núcleos de CPU "
 "disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "&Depurar detección de dispositivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -5340,25 +5866,25 @@ msgstr ""
 "en las preferencias tendrá efecto sólo después de que se reinicie el "
 "servidor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Puerto del servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Usuario:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Cont&raseña:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5366,7 +5892,7 @@ msgstr ""
 "Si se deja la contraseña en blanco, cualquiera podrá acceder a su colección "
 "de libros a través la interfaz web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5374,45 +5900,45 @@ msgstr ""
 "El tamaño máximo (anchura × altura) con el que se mostrarán las portadas. "
 "Las portadas mayores se redimensionarán. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "&Tamaño máximo de portada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Mostrar contraseña"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "Número máximo de elementos &OPDS por consulta:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr "&Máximo número de elementos OPDS sin agrupar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "&Detener servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "Pro&bar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "Ejecutar servidor &automáticamente al iniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Ver registros del &servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5429,7 +5955,7 @@ msgstr ""
 "el lector Stanza de su iPhone, donde miservidor es el nombre de servidor "
 "completo o la dirección IP del equipo donde se ejecuta calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5437,27 +5963,27 @@ msgstr ""
 "Aquí puede personalizar el comportamiento de calibre controlando qué "
 "complementos usa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Activar/&Desactivar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Personalizar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Eliminar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Añadir nuevo complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Fichero de complemento:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Añadir"
 
@@ -5494,10 +6020,11 @@ msgid "Number"
 msgstr "Número"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Fecha"
 
@@ -5513,73 +6040,75 @@ msgstr "Texto explicativo añadido a create_ct_column.py"
 msgid "Create and edit tag-based columns"
 msgstr "Crear y editar columnas basadas en etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr "Texto, columna mostrada en el explorador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 "Texto separado por comas, como las etiquetas, se mostrará en el explorador "
 "de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 "Texto largo, como los comentarios, no se mostrará en el explorador de "
 "etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr "Números con decimales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr "Enteros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Valoraciones, se mostrarán con estrellas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr "Sí/No"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr "No hay ninguna columna seleccionada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr "No se ha seleccionado ninguna columna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr "La columna seleccionada no es una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "No se ha asignado nombre de búsqueda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
-"La etiqueta debe contener sólo letras y números, y empezar con una letra"
+"La etiqueta debe contener sólo letras, dígitos y subrayados, y empezar con "
+"una letra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr "No se ha asignado ningún encabezado de columna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr "El nombre de búsqueda %s ya está en uso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr "El encabezado %s ya está en uso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5706,6 +6235,27 @@ msgstr "&Mostrar este aviso otra vez"
 msgid "ERROR"
 msgstr "ERROR"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Formato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Orden de autor"
@@ -5933,11 +6483,6 @@ msgstr "No es una imagen válida"
 msgid "Choose formats for "
 msgstr "Elegir formatos para "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Libros"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "No tiene permiso"
@@ -5976,70 +6521,79 @@ msgstr "La portada del formato %s no es válida"
 msgid "Abort the editing of all remaining books"
 msgstr "Abortar la edición de todos los libros restantes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Este ISBN es válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Este ISBN no es válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr "No se ha podido utilizar el editor de etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+"El editor de etiquetas no se puede usar si has modificado las etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Descargando portada..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "No se pudo descargar la portada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No se pudo descargar la portada.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "El tiempo de descarga ha vencido."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "No se pudo encontrar la portada de este libro. Inténtelo de nuevo "
 "especificando primero el ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Portada incorrecta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "La portada no es una imagen válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Se encontraron errores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "Se encontraron errores al descargar los metadatos sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "No se pudieron obtener los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "Debe especificar al menos uno de entre ISBN, título, autores o editorial"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "No se pudo abrir %s. ¿Lo está usando algún otro programa?"
 
@@ -6419,12 +6973,12 @@ msgid "Choose formats"
 msgstr "Elegir formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autores"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Editoriales"
 
@@ -6550,12 +7104,12 @@ msgstr ""
 "actual"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr "El elemento está en blanco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "No puede establecerse un elemento en blanco. Bórrelo en su lugar."
 
@@ -6587,15 +7141,15 @@ msgstr "Debe seleccionar al menos un elemento de la lista."
 msgid "Are you certain you want to delete the following items?"
 msgstr "¿Está seguro de que quiere borrar los siguientes elementos?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr "Editor de categorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr "Elementos en uso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
@@ -6603,11 +7157,11 @@ msgstr ""
 "Borrar elemento de la base de datos. Esto quitará el elemento de todos los "
 "libros y después lo eliminará de la base de datos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr "Renombrar el elemento en todos los libros que lo usen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr "Ctrl+S"
 
@@ -6884,11 +7438,11 @@ msgstr "Expresión regular (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "No hay coincidencias"
 
@@ -6924,54 +7478,209 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expresión regular (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Guardar un solo formato en disco..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Editar metadatos por separado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Edita metadatos en bloque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Descargar metadatos y portadas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Descargar sólo los metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Descargar sólo las portadas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Descargar sólo metadatos sociales"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Unir en el primer libro seleccionado - borrar el resto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Unir en el primer libro seleccionado - mantener el resto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Añadir libros desde un único directorio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Añadir libros de directorios, incluyendo subdirectorios (Un libro por "
+"directorio, se asume que cada fichero de libro electrónico es el mismo libro "
+"en diferente formato."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Añadir libros de directorios, incluyendo subdirectorios (Múltiples libros "
+"por directorio, se asume que cada fichero de libro electrónico es un libro "
+"diferente."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Añadir libro en blanco. (Entrada de libro sin ningún formato)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Guardar en el disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Guardar en el disco, en un único directorio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Guardar solamente el formato %s en disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr "Guardar sólo el formato %s en un único directorio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Mostrar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Mostrar un formato específico"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Eliminar libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Eliminar formatos específicos de los libros seleccionados.."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Eliminar todos los formatos de los libros seleccionados, excepto..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Eliminar cubiertas de los libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Convertir por separado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Convertir en bloque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Crear catálogo de los libros en la biblioteca de calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Ejecutar el asistente de bienvenida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Libros similares..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr "Navegador de carátulas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr "Navegador de etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr "Detalles del Libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Tarea"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Estado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progreso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Tiempo transcurrido en ejecución"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Hay %d tareas activas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Tarea desconocida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Hay %d tareas en espera:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "No se puede detener esta tarea"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "No se pueden detener tareas que se comunican con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "La tarea ya se ha ejecutado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "No disponible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Tareas:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Pulse para ver las tareas activas."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - tareas"
 
@@ -6983,112 +7692,90 @@ msgstr "N"
 msgid "Y"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr "En el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Tamaño (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Valoración"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Ninguno"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr "El nombre de búsqueda es \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "En la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr "Tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr "Colecciones"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Formato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr "Marcado para borrarlo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doble clic para <b>editarme</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr "Ocultar columna %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr "Ordenar según %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr "Descendente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr "Cambiar la alineación del texto para %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr "Izquierda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr "Derecha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr "Centro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr "Mostrar columna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr "Restaurar formato por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "No permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7187,56 +7874,57 @@ msgstr "Dirigir registro de depuración a la consola"
 msgid "Do not check for updates"
 msgstr "No comprobar actualizaciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
+msgid "Calibre Library"
+msgstr "Biblioteca de calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
 msgid "Choose a location for your calibre e-book library"
 msgstr "Escoja una ubicación para su biblioteca de libros de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
 msgid "Failed to create library"
 msgstr "Error en la creación de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "Error en la creación de la biblioteca de calibre en: %r. Cancelando."
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr "Fallo al crear la libreria calibre en: %r."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
+msgid "Choose a location for your new calibre e-book library"
+msgstr "Escoja una ubicación para su nueva biblioteca de libros de calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
 msgid "Initializing user interface..."
 msgstr "Iniciando la interfaz de usuario..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
 msgid "Repairing failed"
 msgstr "Reparación fallida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
 "La reparación de la base de datos falló. Comenzando con una nueva biblioteca "
 "vacía."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
-msgid "Calibre Library"
-msgstr "Biblioteca de calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
-msgid "Choose a location for your new calibre e-book library"
-msgstr "Escoja una ubicación para su nueva biblioteca de libros de calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Ubicación de la base de datos incorrecta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 "Ubicación de la base de datos %r errónea. Calibre se cerrará a continuación."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "Base de datos corrupta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
@@ -7246,88 +7934,88 @@ msgstr ""
 "intente repararla automáticamente? Si escoge \"No\", se creará una nueva "
 "biblioteca de calibre vacía"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 "Reparando la base de datos. Esto puede requerir mucho tiempo si la colección "
 "es grande."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 "Ubicación de la base de datos %r errónea. Se comenzará con una biblioteca de "
 "calibre nueva y vacía"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr "Iniciando %s: Cargando libros..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Si está seguro de que no está en ejecución"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "No se puede iniciar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s ya está ejecutándose."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "puede estar en ejecución en la bandeja del sistema, en la"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "zona superior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "zona inferior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "inténtelo después de reiniciar el equipo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "pruebe a borrar el fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr "Restringir a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr "Sólo se mostrarán los libros que coincidan con la búsqueda guardada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "ajustado en ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Búsqueda avanzada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -7336,147 +8024,117 @@ msgstr ""
 "comentarios, etc.<br><br>Se buscan libros que contengan todas las palabras "
 "separadas por espacios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Reiniciar la búsqueda rápida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 "Elija una búsqueda guardada o asigne un nombre para guardar la nueva búsqueda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Copiar el texto de búsqueda actual (en vez del nombre de búsqueda)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Guardar la búsqueda actual con el nombre mostrado en el recuadro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Borrar la búsqueda guardada actual"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Ordenar por &popularidad"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Buscar cualquiera"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Buscar todas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr "Crear, editar y borrar categorías de usuario"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr "Administrar categorías de &usuario"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Añadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Eliminar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Supr"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Editar metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr "Unir registros de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Guardar en el disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Descargar noticias (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Convertir libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Mostrar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Abrir la carpeta que lo contiene"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Mostrar detalles del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Libros del mismo autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Libros de la misma serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Libros de la misma editorial"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Libros con las mismas etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7509,16 +8167,36 @@ msgstr "El libro no tiene ni título ni ISBN"
 msgid "No matches found for this book"
 msgstr "No se ha encontrado el libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "La búsqueda seleccionada será <b>borrada permanentemente</b>. ¿Está seguro?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Buscar (Para búsqueda avanzada, pulse el botón de la izquierda)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr "({0} de {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(todos los libros)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr "({0} de todos)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Pulse una tecla..."
@@ -7579,83 +8257,76 @@ msgstr "Limpiar"
 msgid "&Alternate shortcut:"
 msgstr "&Atajo alternativo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Tareas:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Pulse para ver las tareas activas."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr "Ocultar detalles del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr "Mostrar detalles del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr "Ocultar explorador de etiquetas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr "Mostrar explorador de etiquetas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr "Ocultar explorador de portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr "Mostrar explorador de portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr "Barra lateral"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr "No se pudo cargar el explorador de portadas: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr "Renombrar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr "Ocultar categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr "Mostrar categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr "Ver todas las categorias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
-msgstr "Administrar "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr "Administrar búsquedas guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr "Administrar categorías de usuarios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
-msgstr "El nombre %s ya está en uso."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Nombre de búsqueda duplicado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "El nombre guardado buscado %s está en uso."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Buscar todas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Buscar cualquiera"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "Administrar categorías de &usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -7700,613 +8371,62 @@ msgstr ""
 "Los siguientes libros ya han sido convertidos al formato %s. ¿Desea volver a "
 "convertirlos?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Guardar un solo formato en disco..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Buscar (Para búsqueda avanzada, pulse el botón de la izquierda)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Error en la comunicación con el dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "&Donar para apoyar a calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "&Desconectar dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>Para ayuda mirar el: <a href=\"%s\">Manual de usuario</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s por <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Editar metadatos por separado"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Edita metadatos en bloque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Descargar metadatos y portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Descargar sólo los metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Descargar sólo las portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Descargar sólo metadatos sociales"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Unir en el primer libro seleccionado - borrar el resto"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Unir en el primer libro seleccionado - mantener el resto"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Añadir libros desde un único directorio"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Añadir libros de directorios, incluyendo subdirectorios (Un libro por "
-"directorio, se asume que cada fichero de libro electrónico es el mismo libro "
-"en diferente formato."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Añadir libros de directorios, incluyendo subdirectorios (Múltiples libros "
-"por directorio, se asume que cada fichero de libro electrónico es un libro "
-"diferente."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Añadir libro en blanco. (Entrada de libro sin ningún formato)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Guardar en el disco, en un único directorio"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Guardar solamente el formato %s en disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr "Guardar sólo el formato %s en un único directorio"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Mostrar un formato específico"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Eliminar libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Eliminar formatos específicos de los libros seleccionados.."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Eliminar todos los formatos de los libros seleccionados, excepto..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Eliminar cubiertas de los libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Convertir por separado"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Convertir en bloque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Crear catálogo de los libros en la biblioteca de calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Ejecutar el asistente de bienvenida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Libros similares..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Guía de inicio rápido de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr "Seleccionar carpeta para abrir como un dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Explorar por portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr "({0} de {1})"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(todos los libros)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr "({0} de todos)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Dispositivo: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " detectado."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Base de datos del dispositivo corrupta"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>La base de datos de libros en el lector esta corrupta. "
-"Intente lo siguiente:\n"
-"                <ol>\n"
-"                <li>Desconecte el lector. Espere a que termine de regenerar "
-"la base de datos (es decir, espere a que esté listo para usarse). Conéctelo "
-"de nuevo. Ahora debería funcionar con %(app)s correctamente. En caso "
-"contrario intente lo siguiente.</li>\n"
-"                <li>Salga de %(app)s. Localice el fichero media.xml en la "
-"memoria principal del lector.  Una vez localizado, bórrelo. Desconecte el "
-"lector. Espere a que termine de regenerar la base de datos, conéctelo de "
-"nuevo y reinicie %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Usar sólo la biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "Usar anotaciones generadas sólo desde la biblioteca principal"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "No hay libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr "No se han seleccionado libros desde los que obtener anotaciones"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "Mezclando anotaciones de usuario en la base de datos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Última página leída: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Última página leída: Localizada en %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Lugar %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Page %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Lugar %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "¿Cuantos libros vacios?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "¿Cuantos libros vacios debe de estar aumentado?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Enviando libros al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "Libros en EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "Libros en LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "Libros en HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "Libros en LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "Libros en MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr "Libros en formato topaz"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Libros en formato texto"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "Libros en PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Cómics"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Archivos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "Libros soportados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "Se han unido algunos libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Se han encontrado algunos libros duplicados y se han unido a los siguientes "
-"libros existentes:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Fallo leyendo metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Fallo leyendo metadatos de"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "No se puede borrar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "No hay libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "Elegir formatos a borrar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "Elegir formatos que <b>no</b> hayan de ser borrados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Los libros seleccionados serán <b>eliminados permanentemente</b> y los "
-"ficheros borrados del equipo. ¿Está seguro?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-"Los libros seleccionados se <b>borrarán permanentemente</b> del dispositivo. "
-"¿Está seguro?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Eliminando libros del dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "No se pueden descargar los metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "metadatos sociales"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "portadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Descargando %s para %d libro(s)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "No se pudieron descargar algunos metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "No se pudieron descargar metadatos para:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "No se pudieron descargar metadatos:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "No se pueden editar los metadatos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "No se pueden unir los libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Deben seleccionarse al menos dos libros para unirlos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-"Todos los formatos y metadatos de los libros seleccionados se añadirán al "
-"<b>primer libro seleccionado</b>.<br><br>El segundo libro y los siguientes "
-"no se borrarán ni se modificarán.<br><br>Confirme que quiere continuar."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-"Todos los formatos y metadatos de los libros seleccionados se añadirán al "
-"<b>primer libro seleccionado</b>.<br><br>Después el segundo libro y los "
-"siguientes se <b>borrarán</b>.<br><br>Todos los formatos del primer libro "
-"seleccionado se mantendrán y cualquier formato duplicado en los otros libros "
-"se <b>borrará</b> de forma permanente de su ordenador.<br><br>¿Está "
-"<b>seguro</b> de que quiere continuar?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Va a unir más de 5 libros. ¿Está <b>seguro</b> de que quiere continuar?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "No se puede guardar en disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Elegir directorio de destino"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Error al guardar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Hubo un error al guardar."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "No se pudieron guardar algunos libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "Pulse el botón \"Mostrar detalles\" para ver cuáles."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "No se han seleccionado libros para generar el catálogo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Generando catálogo %s..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"No hay libros para incluir en el catálogo\n"
-"Compruebe la exclusión de etiquetas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Catálogo generado."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "Directorio para exportar catálogos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "Seleccionar destino para %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Obteniendo noticias de "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " obtenidas."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "No se puede convertir"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "Iniciando la conversión de %d libro(s)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "No se puede visualizar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Varios libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-"Está intentando abrir %d libros. Abrir demasiados libros a la vez puede "
-"resultar lento y tener un efecto negativo sobre el funcionamiento del "
-"equipo. Una vez comenzado el proceso no puede deterse hasta que se complete. "
-"¿Desea continuar?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "No se puede abrir la carpeta"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s no tiene formatos disponibles."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar mientras haya tareas en ejecución."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr "No se puede configurar antes de reiniciar calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "No hay información detallada disponible para los libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr "Falló"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Error de comunicación con el dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Hubo un error de comunicación con el dispositivo. Desconecte y vuelva a "
-"conectar el dispositivo o reinicie la aplicación."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8315,15 +8435,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. Debe eliminar primero el DRM con herramientas de "
 "terceros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Receta deshabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -8332,11 +8452,11 @@ msgstr ""
 "lo encuentra útil, por favor, considere donar dinero para apoyar su "
 "desarrollo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hay tareas activas. ¿Está seguro de que quiere salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8347,11 +8467,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "AVISO: Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8359,7 +8479,7 @@ msgstr ""
 "continuará ejecutándose en la bandeja del sistema. Para cerrarlo, elija "
 "<b>Salir</b> en el menú de contexto de la bandeja del sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8367,11 +8487,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Última versión: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Actualización disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8855,15 +8975,15 @@ msgstr "Mayús+F3"
 msgid "Print eBook"
 msgstr "Imprimir libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Pegar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8873,7 +8993,7 @@ msgstr ""
 "%d\n"
 "libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8883,7 +9003,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8893,7 +9013,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8903,46 +9023,58 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Pulsar para ver los libros disponibles en el equipo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr "Pulsar para ver los libros en la memoria principal del lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr "Pulsar para ver los libros en la tarjeta de memoria A del lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr "Pulsar para ver los libros en la tarjeta de memoria B del lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr "Libros ubicados en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Cambiar mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Mayúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Invertir mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Formato de título (todas las iniciales en mayúscula)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr "Arrastre para ajustar el tamaño"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr "Mostrar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr "Ocultar"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9252,48 +9384,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Activar el servidor de &contenidos"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr "today"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr "yesterday"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr "thismonth"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr "daysago"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr "no"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr "unchecked"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr "checked"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr "yes"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr "blank"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr "empty"
 
@@ -9821,7 +9953,7 @@ msgstr ""
 "Valor por defecto: sin filtrado"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostrar información de salida detallada. Útil para la depuración"
 
@@ -9935,45 +10067,49 @@ msgstr ""
 "\n"
 "Para ver la ayuda de cada orden ejecute: %%prog orden --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr "Principal"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr "Tarjeta A"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr "Tarjeta B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrando la base de datos antigua a la biblioteca de libros electrónicos "
 "en %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Compactando la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "Comprobando la integridad de SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "Comprobando ficheros inexistentes."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "ID comprobado"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Calificaciones"
 
@@ -10201,43 +10337,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr "Escribir PID del proceso al archivo especificado"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr "%d libros"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr "%d elementos"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "CALIFICACIÓN: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr "ETIQUETAS: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "SERIE: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Libros en la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr "Por "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr "Libros ordenados por "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr "Más reciente"
 
@@ -10383,34 +10519,38 @@ msgid "English (Pakistan)"
 msgstr "Inglés (Pakistán)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Inglés (Singapur)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "Inglés (Yemen)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "Inglés (Irlanda)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Ingles (Chino)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Español (Paraguay)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Alemán (AT)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Neerlandés (NL)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Neerlandés (BE)"
 
@@ -10474,92 +10614,92 @@ msgstr ""
 "No descargar la última versión de las recetas incluidas del servidor de "
 "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Fuente de noticias desconocida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "La receta \"%s\" necesita usuario y contraseña."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Descarga finalizada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Fallo al descargar los siguientes artículos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Fallo al descargar partes de los siguientes artículos"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tEnlaces fallidos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "No se pudo obtener el artículo. Ejecute calibre con -vv para ver el motivo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Obteniendo canales de noticias..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Se obtivieron canales de noticias de la página principal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Intentando descargar la portada..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "Generando el rótulo:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando la descarga [%d proceso(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Canales de noticias descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "No se pudo descargar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Descargando la portada desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "Imagen del rótulo descargada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Artículo sin título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Artículo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Falló la descarga del artículo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Obteniendo canal de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10567,7 +10707,7 @@ msgstr ""
 "No se pudo ingresar, revise su nombre de usuario o clave para el servicio de "
 "boletín de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10590,7 +10730,7 @@ msgstr "Planificado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10600,12 +10740,12 @@ msgstr ""
 "\n"
 "Donde URL es por ejemplo http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Directorio base en el cual se almacena la URL. Por defecto es %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10613,7 +10753,7 @@ msgstr ""
 "Tiempo máximo de espera de respuesta del servidor (en segundos). Valor por "
 "defecto: %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10621,7 +10761,7 @@ msgstr ""
 "Máximo número de niveles de recursión, es decir, profundidad de los enlaces "
 "a seguir. Valor por defecto: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10629,7 +10769,7 @@ msgstr ""
 "El número máximo de ficheros a descargar. Esto se aplica solamente a "
 "ficheros procedentes de etiquetas <a href>. Por defecto es %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10637,7 +10777,7 @@ msgstr ""
 "Intervalo minimo en segundos entre adquisiciones de datos consecutivas. "
 "Valor defecto: %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10645,7 +10785,7 @@ msgstr ""
 "Codificación para los sitios web que está intentando descargar. Por defecto "
 "se intentará averiguar la codificación."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -10656,7 +10796,7 @@ msgstr ""
 "de las expresiones regulares, se seguirá el enlace. Por defecto todos los "
 "enlaces se siguen."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10670,7 +10810,7 @@ msgstr ""
 "enlace se descarta. Si ambas opciones --filter-regexp y --match-regexp se "
 "especifican, entonces --filter-regexp se aplica primero."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "No descargar estilos CSS."
 
@@ -11164,6 +11304,9 @@ msgstr "No descargar estilos CSS."
 #~ "<p>Ya existen libros con el mismo título en la base de datos. ¿Añadirlo de "
 #~ "todas formas?<ul>"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Base de datos del dispositivo corrupta"
+
 #~ msgid ""
 #~ "<p>An invalid database already exists at %s, delete it before trying to move "
 #~ "the existing database.<br>Error: %s"
@@ -11658,6 +11801,9 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Output:"
 #~ msgstr "Salida:"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Ordenar por &popularidad"
+
 #~ msgid ""
 #~ " is communicating with the device!<br>\n"
 #~ "                      'Quitting may cause corruption on the device.<br>\n"
@@ -12481,6 +12627,9 @@ msgstr "No descargar estilos CSS."
 #~ "Este fichero RTF tiene una característica no soportada por calibre. "
 #~ "Conviértalo a HTML primero y pruebe con éste."
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Ordenar la lista de etiquetas por popularidad"
+
 #~ msgid "Input character &encoding"
 #~ msgstr "Codificación de &entrada"
 
@@ -12569,6 +12718,35 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Elija otra ubicación para la biblioteca de libros electrónicos."
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>La base de datos de libros en el lector esta corrupta. "
+#~ "Intente lo siguiente:\n"
+#~ "                <ol>\n"
+#~ "                <li>Desconecte el lector. Espere a que termine de regenerar "
+#~ "la base de datos (es decir, espere a que esté listo para usarse). Conéctelo "
+#~ "de nuevo. Ahora debería funcionar con %(app)s correctamente. En caso "
+#~ "contrario intente lo siguiente.</li>\n"
+#~ "                <li>Salga de %(app)s. Localice el fichero media.xml en la "
+#~ "memoria principal del lector.  Una vez localizado, bórrelo. Desconecte el "
+#~ "lector. Espere a que termine de regenerar la base de datos, conéctelo de "
+#~ "nuevo y reinicie %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid ""
 #~ "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 #~ "first remove the DRM using 3rd party tools."
@@ -12849,3 +13027,47 @@ msgstr "No descargar estilos CSS."
 #~ "es un puerto de sistema. Su sistema operativo <b>podría</b> no permitir al "
 #~ "servidor utilizar ese puerto. Para estar seguros, elija un número de puerto "
 #~ "superior a 1024."
+
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr "Error en la creación de la biblioteca de calibre en: %r. Cancelando."
+
+#~ msgid ""
+#~ "The label must contain only letters and digits, and start with a letter"
+#~ msgstr ""
+#~ "La etiqueta debe contener sólo letras y números, y empezar con una letra"
+
+#~ msgid "Hide Tag Browser"
+#~ msgstr "Ocultar explorador de etiquetas"
+
+#~ msgid "Show Tag Browser"
+#~ msgstr "Mostrar explorador de etiquetas"
+
+#~ msgid "Show Book Details"
+#~ msgstr "Mostrar detalles del libro"
+
+#~ msgid "Hide Book Details"
+#~ msgstr "Ocultar detalles del libro"
+
+#~ msgid "Create, edit, and delete user categories"
+#~ msgstr "Crear, editar y borrar categorías de usuario"
+
+#~ msgid "Manage "
+#~ msgstr "Administrar "
+
+#~ msgid "Rename"
+#~ msgstr "Renombrar"
+
+#~ msgid "Side bar"
+#~ msgstr "Barra lateral"
+
+#~ msgid "Cover browser could not be loaded: "
+#~ msgstr "No se pudo cargar el explorador de portadas: "
+
+#~ msgid "Hide Cover Browser"
+#~ msgstr "Ocultar explorador de portadas"
+
+#~ msgid "Show Cover Browser"
+#~ msgstr "Mostrar explorador de portadas"
+
+#~ msgid "The name %s is already used."
+#~ msgstr "El nombre %s ya está en uso."
diff --git a/src/calibre/translations/fa.po b/src/calibre/translations/fa.po
new file mode 100644
index 0000000000..5f879b125e
--- /dev/null
+++ b/src/calibre/translations/fa.po
@@ -0,0 +1,9686 @@
+# Persian translation for calibre
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the calibre package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 16:56+0000\n"
+"Last-Translator: m m naseri <m.m.naseri@gmail.com>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+msgid "Does absolutely nothing"
+msgstr "هیچ کار به خصوصی نمی کند"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:329
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:332
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:38
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:610
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:816
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:908
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:913
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:979
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:173
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/palmdoc/writer.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ztxt/writer.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:83
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:65
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:62
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:213
+#: /home/kovid/work/calibre/src/calibre/library/database.py:913
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
+#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:50
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+msgid "Base"
+msgstr "پایه"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
+msgid "File type"
+msgstr "نوع پرونده"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
+msgid "Metadata reader"
+msgstr "خواننده ی فراداده"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
+msgid "Metadata writer"
+msgstr "نویسنده ی فراداده"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
+msgid "Catalog generator"
+msgstr "مولّد کاتالوگ"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"تمام پیوند های یک فایل HTML را دنبال می کند و یک فایل ZIP حاوی تمام فایل های "
+"پیوند داده شده تولید می کند. این افزونه هر بار که شما یک فایل HTML را به "
+"کتاب خانه ی خود اضافه می کنید اجرا می شود."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:50
+msgid ""
+"Character encoding for the input HTML files. Common choices include: cp1252, "
+"latin1, iso-8859-1 and utf-8."
+msgstr ""
+"رمزگذاری نویسه ها در فایل های HTML  ورودی. برخی از گزینه های رایج عبارت اند "
+"از: cp1252، latin1، iso-8850-1 و utf-8."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:57
+msgid ""
+"Create a PMLZ archive containing the PML file and all images in the "
+"directory pmlname_img or images. This plugin is run every time you add a PML "
+"file to the library."
+msgstr ""
+"یک فایل فشرده ی PMLZ حاوی فایل PML و تمامی تصاویر موجود در پوشه ی "
+"pmlname_img یا images تولید می کند. این افزونه هر بار که شما یک فایل PML به "
+"کتاب خانه ی خود اضافه می کنید اجرا می شود."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
+msgid "Extract cover from comic files"
+msgstr "استخراج جلد از فایل های کمیک"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:127
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:139
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:149
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:159
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:170
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:180
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:190
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:200
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:210
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:220
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:231
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:242
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:254
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:286
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:296
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:306
+msgid "Read metadata from %s files"
+msgstr "خواندن فراداده از فایل های %s"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
+msgid "Read metadata from ebooks in RAR archives"
+msgstr "خواندن فراداده از ای بوک های داخل فایل های RAR"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
+msgid "Read metadata from ebooks in ZIP archives"
+msgstr "خواندن فراداده از ای بوک های داخل فایل های ZIP"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:328
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:338
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:348
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:370
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:381
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:391
+msgid "Set metadata in %s files"
+msgstr "تنظیم کردن فراداده در فایل های %s"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
+msgid "Set metadata from %s files"
+msgstr "تنظیم کردن فراداده با توجّه به فایل های %s"
+
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
+msgid "Conversion Input"
+msgstr "ورودی تبدیل"
+
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:125
+msgid ""
+"Specify the character encoding of the input document. If set this option "
+"will override any encoding declared by the document itself. Particularly "
+"useful for documents that do not declare an encoding or that have erroneous "
+"encoding declarations."
+msgstr ""
+"تنظیم رمزگذاری نویسه های سند ورودی. اگر این گزینه انتخاب شود، هر رمزگذاری "
+"دیگری که در خود سند تعریف شده باشد ندیده گرفته می شود. این گزینه به خصوص "
+"برای تنظیم رمزگذاری برای سندهایی که رمزگذاری خود را تعریف نمی کنند (یا آن را "
+"به اشتباه تعریف می کنند) کارآمد است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
+msgid "Conversion Output"
+msgstr "خروجی تبدیل"
+
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:255
+msgid ""
+"If specified, the output plugin will try to create output that is as human "
+"readable as possible. May not have any effect for some output plugins."
+msgstr ""
+"اگر تنظیم شده باشد، افزونه ی خروجی سعی می کند تا سند خروجی را تا حدّ ممکن به "
+"نوشتار قابل خواندن توسّط انسان نزدیک کند. برای برخی از افزونه های خروجی ممکن "
+"است کار به خصوصی انجام ندهد."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
+msgid "Input profile"
+msgstr "نمایه ی ورودی"
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49
+msgid ""
+"This profile tries to provide sane defaults and is useful if you know "
+"nothing about the input document."
+msgstr ""
+"این نمایه به منظور ارائه ی پیش فرض های قابل قبول ایجاد شده است، و به خصوص "
+"زمانی کاربرد دارد که شما هیچ اطّلاعی از سند ورودی ندارید."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:266
+msgid ""
+"This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
+msgstr ""
+"این نمایه برای سری SONY PRS در نظر گرفته شده است؛ یعنی مدل های "
+"500/505/600/700 و غیر از آن."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
+msgid "This profile is intended for the SONY PRS 300."
+msgstr "این نمایه برای مدل های SONY PRS 300 در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
+msgid "This profile is intended for the SONY PRS-900."
+msgstr "این نمایه برای SONY PRS-900 در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
+msgid "This profile is intended for the Microsoft Reader."
+msgstr "این نمایه برای Microsoft Reader در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
+msgid "This profile is intended for the Mobipocket books."
+msgstr "این نمایه برای کتاب های Mobipocket در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
+msgid "This profile is intended for the Hanlin V3 and its clones."
+msgstr "این نمایه برای Hanlin V3 و مشابه آن در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
+msgid "This profile is intended for the Hanlin V5 and its clones."
+msgstr "این نمایه برای Hanlin V5 و مشابه آن در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
+msgid "This profile is intended for the Cybook G3."
+msgstr "این نمایه برای Cybook G3 در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
+msgid "This profile is intended for the Cybook Opus."
+msgstr "این نمایه برای Cybook Opus  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
+msgid "This profile is intended for the Amazon Kindle."
+msgstr "این نمایه برای Amazon Kindle  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
+msgid "This profile is intended for the Irex Illiad."
+msgstr "این نمایه برای Irex Illiad  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
+msgid "This profile is intended for the IRex Digital Reader 1000."
+msgstr "این نمایه برای IRex Digital Reader 1000  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
+msgid "This profile is intended for the IRex Digital Reader 800."
+msgstr "این نمایه برای IRex Digital Reader 800  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
+msgid "This profile is intended for the B&N Nook."
+msgstr "این نمایه برای B&N Nook  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
+msgid "Output profile"
+msgstr "نمایه ی خروجی"
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:230
+msgid ""
+"This profile tries to provide sane defaults and is useful if you want to "
+"produce a document intended to be read at a computer or on a range of "
+"devices."
+msgstr ""
+"این نمایه به منظور ارائه ی پیش فرض های قابل قبول برای سند هایی که با هدف "
+"خواندن توسّط رایانه یا دست گاه های گوناگون دیگر تولید می شوند، ایجاد شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
+msgid ""
+"Intended for the iPad and similar devices with a resolution of 768x1024"
+msgstr "برای کار با iPad و یا دست گاه های مشابه با بزرگ نمایی ۷۶۸×۱۰۲۴"
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
+msgid "This profile is intended for the Kobo Reader."
+msgstr "این نمایه برای Kobo Reader  در نظر گرفته شده است."
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
+msgid "This profile is intended for the SONY PRS-300."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
+msgid "This profile is intended for the 5-inch JetBook."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
+msgid ""
+"This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
+"landscape mode. Mainly useful for comics."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
+msgid "This profile is intended for the Amazon Kindle DX."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+msgid ""
+"    %prog options\n"
+"\n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
+msgid "Communicate with Android phones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:39
+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:70
+msgid "Communicate with S60 phones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
+msgid ""
+"Some books not found in iTunes database.\n"
+"Delete using the iBooks app.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
+msgid "settings for device drivers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+msgid "Ordered list of formats the device will accept"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
+msgid "Communicate with the Binatone Readme eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
+msgid "Communicate with the Blackberry smart phone."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:90
+msgid "Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
+msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
+msgid "Communicate with the EB600 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
+msgid "Entourage Edge"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
+msgid "Communicate with the Entourage Edge."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
+msgid "Communicate with the ESlick eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
+#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
+msgid "Device Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
+msgid "Communicate with the BOOX eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
+msgid "Communicate with The Book reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
+msgid "Communicate with the SpringDesign Alex eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
+msgid "John Schember"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
+msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
+msgid "Communicate with the IRex Digital Reader 800"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
+msgid "Communicate with the Iriver Story reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
+msgid "Communicate with the JetBook eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
+msgid "Communicate with the Kindle eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
+msgid "Communicate with the Kindle 2 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
+msgid "Communicate with the Kindle DX eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
+msgid "Communicate with the Kobo Reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
+msgid "Communicate with the Palm Pre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
+msgid "Communicate with the Booq Avant"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
+msgid "Communicate with the Nokia 770 internet tablet."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
+msgid "Communicate with the Nokia 810 internet tablet."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
+msgid "The Nook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
+msgid "Communicate with the Nook eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
+msgid "Communicate with the Nuut2 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
+msgid "Communicate with the Sony PRS-500 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+msgid ""
+"Comma separated list of metadata fields to turn into collections on the "
+"device. Possibilities include: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
+msgid "Communicate with the Samsung SNE eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
+msgid "Communicate with the Teclast K3 reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
+msgid "Communicate with the Newsmy reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
+msgid "Communicate with the iPapyrus reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
+msgid "Unable to detect the %s mount point. Try rebooting."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
+msgid "Unable to detect the %s disk drive."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
+msgid "Could not find mount helper: %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
+msgid ""
+"Unable to detect the %s disk drive. Your  kernel is probably exporting a "
+"deprecated version of SYSFS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
+msgid "Unable to mount main memory (Error code: %d)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
+msgid "The reader has no storage card in this slot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
+msgid "Selected slot: %s is not supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
+msgid "There is insufficient free space in main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
+msgid "There is insufficient free space on the storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
+msgid "Configure Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
+msgid "Place files in sub directories if the device supports them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+msgid "Read metadata from files on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
+msgid "Template to control how books are saved"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
+msgid "Extra customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
+msgid "Communicate with an eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
+msgid "Get device information..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+msgid "Getting list of books on device..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+msgid "Transferring books to device..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
+msgid "Adding books to device metadata listing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
+msgid "Removing books from device..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
+msgid "Removing books from device metadata listing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
+msgid "Sending metadata to device..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
+msgid "%prog [options] mybook.chm"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
+msgid "Output directory. Defaults to current directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
+msgid "Set the book title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
+msgid "Set sort key for the title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
+msgid "Set the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
+msgid "Set sort key for the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597
+msgid "The category this book belongs to. E.g.: History"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600
+msgid "Path to a graphic that will be set as this files' thumbnail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
+msgid "Path to a txt file containing a comment."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:62
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
+msgid "Extract thumbnail from LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
+msgid "Set the publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
+msgid "Set the book classification"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:65
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610
+msgid "Set the book creator"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
+msgid "Set the book producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:68
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
+msgid ""
+"Extract cover from LRF file. Note that the LRF format has no defined cover, "
+"so we use some heuristics to guess the cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615
+msgid "Set book ID"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
+msgid "Set font delta"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
+msgid "Rendered %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
+msgid "Failed %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
+msgid ""
+"Failed to process comic: \n"
+"\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:279
+msgid ""
+"Number of colors for grayscale image conversion. Default: %default. Values "
+"of less than 256 may result in blurred text on your device if you are "
+"creating your comics in EPUB format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:283
+msgid ""
+"Disable normalize (improve contrast) color range for pictures. Default: False"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:286
+msgid "Maintain picture aspect ratio. Default is to fill the screen."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
+msgid "Disable sharpening."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:290
+msgid ""
+"Disable trimming of comic pages. For some comics, trimming might remove "
+"content as well as borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
+msgid "Don't split landscape images into two portrait images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:295
+msgid ""
+"Keep aspect ratio and scale image using screen height as image width for "
+"viewing in landscape mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:298
+msgid ""
+"Used for right-to-left publications like manga. Causes landscape pages to be "
+"split into portrait pages from right to left."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
+msgid ""
+"Enable Despeckle. Reduces speckle noise. May greatly increase processing "
+"time."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:305
+msgid ""
+"Don't sort the files found in the comic alphabetically by name. Instead use "
+"the order they were added to the comic."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:309
+msgid ""
+"The format that images in the created ebook are converted to. You can "
+"experiment to see which format gives you optimal size and look on your "
+"device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
+msgid "Apply no processing to the image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
+msgid "Do not convert the image to grayscale (black and white)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:452
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:463
+msgid "Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
+msgid ""
+"input_file output_file [options]\n"
+"\n"
+"Convert an ebook from one format to another.\n"
+"\n"
+"input_file is the input and output_file is the output. Both must be "
+"specified as the first two arguments to the command.\n"
+"\n"
+"The output ebook format is guessed from the file extension of output_file. "
+"output_file can also be of the special format .EXT where EXT is the output "
+"file extension. In this case, the name of the output file is derived the "
+"name of the input file. Note that the filenames must not start with a "
+"hyphen. Finally, if output_file has no extension, then it is treated as a "
+"directory and an \"open ebook\" (OEB) consisting of HTML files is written to "
+"that directory. These files are the files that would normally have been "
+"passed to the output plugin.\n"
+"\n"
+"After specifying the input and output file you can customize the conversion "
+"by specifying various options. The available options depend on the input and "
+"output file types. To get help on them specify the input and output file and "
+"then use the -h option.\n"
+"\n"
+"For full documentation of the conversion system see\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
+msgid "INPUT OPTIONS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
+msgid "Options to control the processing of the input %s file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
+msgid "OUTPUT OPTIONS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
+msgid "Options to control the processing of the output %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:119
+msgid "Options to control the look and feel of the output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
+msgid "Control auto-detection of document structure."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:145
+msgid ""
+"Control the automatic generation of a Table of Contents. By default, if the "
+"source file has a Table of Contents, it will be used in preference to the "
+"automatically generated one."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
+msgid "Options to set metadata in the output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
+msgid "Options to help with debugging the conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
+msgid "List builtin recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
+msgid "Output saved to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
+msgid "Level of verbosity. Specify multiple times for greater verbosity."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
+msgid ""
+"Save the output from different stages of the conversion pipeline to the "
+"specified directory. Useful if you are unsure at which stage of the "
+"conversion process a bug is occurring."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111
+msgid ""
+"Specify the input profile. The input profile gives the conversion system "
+"information on how to interpret various information in the input document. "
+"For example resolution dependent lengths (i.e. lengths in pixels). Choices "
+"are:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122
+msgid ""
+"Specify the output profile. The output profile tells the conversion system "
+"how to optimize the created document for the specified device. In some "
+"cases, an output profile is required to produce documents that will work on "
+"a device. For example EPUB on the SONY reader. Choices are:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133
+msgid ""
+"The base font size in pts. All font sizes in the produced book will be "
+"rescaled based on this size. By choosing a larger size you can make the "
+"fonts in the output bigger and vice versa. By default, the base font size is "
+"chosen based on the output profile you chose."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
+msgid ""
+"Mapping from CSS font names to font sizes in pts. An example setting is "
+"12,12,14,16,18,20,22,24. These are the mappings for the sizes xx-small to xx-"
+"large, with the final size being for huge fonts. The font rescaling "
+"algorithm uses these sizes to intelligently rescale fonts. The default is to "
+"use a mapping based on the output profile you chose."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
+msgid "Disable all rescaling of font sizes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
+msgid ""
+"The line height in pts. Controls spacing between consecutive lines of text. "
+"By default no line height manipulation is performed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170
+msgid ""
+"Some badly designed documents use tables to control the layout of text on "
+"the page. When converted these documents often have text that runs off the "
+"page and other artifacts. This option will extract the content from the "
+"tables and present it in a linear fashion."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level three. Each entry is added under the previous level two "
+"entry."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the auto-generated one. With this option, the auto-generated "
+"one is always used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the threshold "
+"number of chapters were detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235
+msgid ""
+"Remove entries from the Table of Contents whose titles match the specified "
+"regular expression. Matching entries and all their children are removed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or <h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as well as any tags that have class=\"chapter\". "
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection, use the expression \"/\". See the XPath Tutorial in the calibre "
+"User Manual for further help on using this feature."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will be appended to "
+"the style rules from the source file, so it can be used to override those "
+"rules."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
+msgid ""
+"An XPath expression. Page breaks are inserted before the specified elements."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285
+msgid ""
+"Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290
+msgid ""
+"Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295
+msgid ""
+"Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300
+msgid ""
+"Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306
+msgid ""
+"Change text justification. A value of \"left\" converts all justified text "
+"in the source to left aligned (i.e. unjustified) text. A value of "
+"\"justify\" converts all unjustified text to justified. A value of "
+"\"original\" (the default) does not change justification in the source file. "
+"Note that only some output formats support justification."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
+msgid ""
+"Remove spacing between paragraphs. Also sets an indent on paragraphs of "
+"1.5em. Spacing removal will not work if the source file does not use "
+"paragraphs (<p> or <div> tags)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
+msgid ""
+"When calibre removes inter paragraph spacing, it automatically sets a "
+"paragraph indent, to ensure that paragraphs can be easily distinguished. "
+"This option controls the width of that indent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:336
+msgid ""
+"Insert a blank line between paragraphs. Will not work if the source file "
+"does not use paragraphs (<p> or <div> tags)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343
+msgid ""
+"Remove the first image from the input ebook. Useful if the first image in "
+"the source file is a cover and you are specifying an external cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351
+msgid ""
+"Insert the book metadata at the start of the book. This is useful if your "
+"ebook reader does not support displaying/searching metadata directly."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359
+msgid ""
+"Attempt to detect and correct hard line breaks and other problems in the "
+"source file. This may make things worse, so use with care."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
+msgid "Use a regular expression to try and remove the header."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
+msgid "The regular expression to use to remove the header."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
+msgid "Use a regular expression to try and remove the footer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
+msgid "The regular expression to use to remove the footer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
+msgid ""
+"Read metadata from the specified OPF file. Metadata read from this file will "
+"override any metadata in the source file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
+msgid ""
+"Transliterate unicode characters to an ASCII representation. Use with care "
+"because this will replace unicode characters with ASCII. For instance it "
+"will replace \"%s\" with \"Mikhail Gorbachiov\". Also, note that in cases "
+"where there are multiple representations of a character (characters shared "
+"by Chinese and Japanese for instance) the representation used by the largest "
+"number of people will be used (Chinese in the previous example)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:416
+msgid ""
+"Preserve ligatures present in the input document. A ligature is a special "
+"rendering of a pair of characters like ff, fi, fl et cetera. Most readers do "
+"not have support for ligatures in their default fonts, so they are unlikely "
+"to render correctly. By default, calibre will turn a ligature into the "
+"corresponding pair of normal characters. This option will preserve them "
+"instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
+msgid "Set the title."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
+msgid "Set the authors. Multiple authors should be separated by ampersands."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
+msgid "The version of the title to be used for sorting. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
+msgid "String to be used when sorting by author. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
+msgid "Set the cover to the specified file or URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
+msgid "Set the ebook description."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:453
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56
+msgid "Set the ebook publisher."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60
+msgid "Set the series this ebook belongs to."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
+msgid "Set the index of the book in this series."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
+msgid "Set the rating. Should be a number between 1 and 5."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:469
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66
+msgid "Set the ISBN of the book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:473
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
+msgid "Set the tags for the book. Should be a comma separated list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
+msgid "Set the book producer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:481
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72
+msgid "Set the language."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
+msgid "Set the publication date."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
+msgid "Set the book timestamp (used by the date column in calibre)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
+msgid "Could not find an ebook inside the archive"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
+msgid "Values of series index and rating must be numbers. Ignoring"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
+msgid "Failed to parse date/time"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
+msgid "Converting input to HTML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
+msgid "Running transforms on ebook..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
+msgid "Creating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
+msgid ""
+"Extract the contents of the generated EPUB file to the specified directory. "
+"The contents of the directory are first deleted, so be careful."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
+msgid ""
+"Turn off splitting at page breaks. Normally, input files are automatically "
+"split at every page break into two files. This gives an output ebook that "
+"can be parsed faster and with less resources. However, splitting is slow and "
+"if your source file contains a very large number of page breaks, you should "
+"turn off splitting on page breaks."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
+msgid ""
+"Split all HTML files larger than this size (in KB). This is necessary as "
+"most EPUB readers cannot handle large file sizes. The default of %defaultKB "
+"is the size required for Adobe Digital Editions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
+msgid ""
+"Normally, if the input file has no cover and you don't specify one, a "
+"default cover is generated with the title, authors, etc. This option "
+"disables the generation of this cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
+msgid ""
+"Do not use SVG for the book cover. Use this option if your EPUB is going to "
+"be used ona  device that does not support SVG, like the iPhone or the "
+"JetBook Lite. Without this option, such devices will display the cover as a "
+"blank page."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
+msgid ""
+"When using an SVG cover, this option will cause the cover to scale to cover "
+"the available screen area, but still preserve its aspect ratio (ratio of "
+"width to height). That means there may be white borders at the sides or top "
+"and bottom of the image, but the image will never be distorted. Without this "
+"option the image may be slightly distorted, but there will be no borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
+msgid "Start"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
+#: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
+msgid "Table of Contents:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:32
+msgid "Do not insert a Table of Contents at the beginning of the book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/rb/output.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:35
+msgid "Add Table of Contents to beginning of the book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:243
+msgid ""
+"Traverse links in HTML files breadth first. Normally, they are traversed "
+"depth first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:250
+msgid ""
+"Maximum levels of recursion when following links in HTML files. Must be non-"
+"negative. 0 implies that no links in the root HTML file are followed. "
+"Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:259
+msgid ""
+"Normally this input plugin re-arranges all the input files into a standard "
+"folder hierarchy. Only use this option if you know what you are doing as it "
+"can result in various nasty side effects in the rest of of the conversion "
+"pipeline."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:267
+msgid ""
+"Average line length for line breaking if the HTML is from a previous partial "
+"conversion of a PDF file. Default is %default which disables this."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
+msgid "\tBook Designer file detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
+msgid "\tParsing HTML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
+msgid "\tBaen file detected. Re-parsing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
+msgid "Written preprocessed HTML to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
+msgid "Processing %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
+msgid "\tConverting to BBeB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552
+msgid "Could not parse file: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
+msgid "%s is an empty file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
+msgid "Failed to parse link %s %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
+msgid "Cannot add link %s to TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
+msgid "Unable to process image %s. Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
+msgid "Unable to process interlaced PNG %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
+msgid ""
+"Could not process image: %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
+msgid ""
+"An error occurred while processing a table: %s. Ignoring table markup."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
+msgid ""
+"Bad table:\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
+msgid "Table has cell that is too large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
+msgid "Could not read cover image: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
+msgid "Cannot read from: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
+msgid "Failed to process opf file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
+msgid ""
+"%prog book.lrf\n"
+"Convert an LRF file into an LRS (XML UTF-8 encoded) file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
+msgid "Output LRS file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
+msgid "Do not save embedded image and font files to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
+msgid "Parsing LRF..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
+msgid "Creating XML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
+msgid "LRS written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+msgid "Could not read from thumbnail file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+msgid ""
+"%prog [options] file.lrs\n"
+"Compile an LRS file into an LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+msgid "Path to output file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:113
+msgid "Verbose processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+msgid "Convert LRS to LRS, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
+msgid "Invalid LRF file. Could not set metadata."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
+msgid ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"Show/edit the metadata in an LRF file.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:603
+msgid ""
+"Path to a txt file containing the comment to be stored in the lrf file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90
+msgid "Enable autorotation of images that are wider than the screen width."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
+msgid "Set the space between words in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97
+msgid "Add a header to all the pages with title and author."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100
+msgid ""
+"Set the format of the header. %a is replaced by the author and %t by the "
+"title. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
+msgid "Add extra spacing below the header. Default is %default pt."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:107
+msgid ""
+"Minimum paragraph indent (the indent of the first line of a paragraph) in "
+"pts. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:112
+msgid ""
+"Render tables in the HTML as images (useful if the document has large or "
+"complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117
+msgid ""
+"Multiply the size of text in rendered tables by this factor. Default is "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
+msgid "The serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
+msgid "The sans-serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
+msgid "The monospace family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
+msgid "Comic"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
+msgid "Title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
+msgid "Author(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
+msgid "Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
+msgid "Producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+msgid "Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
+msgid "Tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
+msgid "Series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
+msgid "Language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
+msgid "Timestamp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
+msgid "Published"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
+msgid "Rights"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
+msgid "EDITORIAL REVIEW"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
+msgid ""
+"Extract common e-book formats from archives (zip/rar) files. Also try to "
+"autodetect if they are actually cbz/cbr files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
+msgid "options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
+msgid ""
+"\n"
+"Read/Write metadata from/to ebook files.\n"
+"\n"
+"Supported formats for reading metadata: %s\n"
+"\n"
+"Supported formats for writing metadata: %s\n"
+"\n"
+"Different file types support different kinds of metadata. If you try to set\n"
+"some metadata on a file type that does not support it, the metadata will be\n"
+"silently ignored.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40
+msgid ""
+"Set the authors. Multiple authors should be separated by the & character. "
+"Author names should be in the order Firstname Lastname."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:44
+msgid ""
+"The version of the title to be used for sorting. If unspecified, and the "
+"title is specified, it will be auto-generated from the title."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:48
+msgid ""
+"String to be used when sorting by author. If unspecified, and the author(s) "
+"are specified, it will be auto-generated from the author(s)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
+msgid "Set the cover to the specified file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
+msgid "Set the book category."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
+msgid "Set the published date."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77
+msgid "Get the cover from the ebook and save it at as the specified file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80
+msgid ""
+"Specify the name of an OPF file. The metadata will be written to the OPF "
+"file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83
+msgid ""
+"Read metadata from the specified OPF file and use it to set metadata in the "
+"ebook. Metadata specified on the command line will override metadata read "
+"from the OPF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
+msgid "Set the BookID in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
+msgid "No file specified"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
+msgid "Original metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
+msgid "Changed metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
+msgid "OPF created in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
+msgid "Cover saved to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
+msgid "No cover found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
+msgid "Metadata download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
+msgid "ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
+msgid "tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+msgid "description/reviews"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
+msgid "Download %s from %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:136
+msgid "Downloads metadata from Google Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:152
+msgid "Downloads metadata from isbndb.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:180
+msgid ""
+"To use isbndb.com you must sign up for a %sfree account%s and enter your "
+"access key below."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:188
+msgid "Downloads social metadata from amazon.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
+msgid ""
+"\n"
+"%prog [options] key\n"
+"\n"
+"Fetch metadata for books from isndb.com. You can specify either the\n"
+"books ISBN ID or its title and author. If you specify the title and author,\n"
+"then more than one book may be returned.\n"
+"\n"
+"key is the account key you generate after signing up for a free account from "
+"isbndb.com.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:105
+msgid "The ISBN ID of the book you want metadata for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
+msgid "The author whose book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
+msgid "The title of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
+msgid "The publisher of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
+msgid "LibraryThing.com timed out. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
+msgid ""
+"Could not fetch cover as server is experiencing high load. Please try again "
+"later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
+msgid " not found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
+msgid "LibraryThing.com server error. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
+msgid ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
+msgid "Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
+msgid "Modify images to meet Palm device size limitations."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
+msgid "When present, use author sort field as author."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30
+msgid ""
+"Don't add Table of Contents to end of book. Useful if the book has its own "
+"table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+msgid "Title for any generated in-line table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
+msgid "Disable compression of the file contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40
+msgid "Tag marking book to be filed with Personal Docs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
+msgid "All articles"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
+msgid "This is an Amazon Topaz book. It cannot be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+msgid "Title Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
+msgid "Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
+msgid "Index"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
+msgid "Glossary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
+msgid "Acknowledgements"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
+msgid "Bibliography"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
+msgid "Colophon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
+msgid "Copyright"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
+msgid "Dedication"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
+msgid "Epigraph"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
+msgid "Foreword"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
+msgid "List of Illustrations"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
+msgid "List of Tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
+msgid "Notes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
+msgid "Preface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
+msgid "Main Text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
+msgid "%s format books are not supported"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+msgid "HTML TOC generation options."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
+msgid "Book Jacket"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/split.py:34
+msgid ""
+"Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
+msgid "OPF/NCX/etc. generation options."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
+msgid "OPF version to generate. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
+msgid ""
+"Generate an Adobe \"page-map\" file if pagination information is available."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
+msgid "Footnotes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
+msgid "Sidebar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+msgid ""
+"Normally calibre treats blank lines as paragraph markers. With this option "
+"it will assume that every line represents a paragraph instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+msgid ""
+"Normally calibre treats blank lines as paragraph markers. With this option "
+"it will assume that every line starting with an indent (either a tab or 2+ "
+"spaces) represents a paragraph. Paragraphs end when the next line that "
+"starts with an indent is reached."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
+msgid "Format to use inside the pdb container. Choices are:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27
+msgid ""
+"Specify the character encoding of the output document. The default is "
+"cp1252. Note: This option is not honored by all formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
+msgid "Do not extract images from the document"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:26
+msgid ""
+"Scale used to determine the length at which a line should be unwrapped. "
+"Valid values are a decimal between 0 and 1. The default is 0.5, this is the "
+"median line length."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
+msgid "Use the new PDF conversion engine."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
+msgid ""
+"command ...\n"
+"\n"
+"command can be one of the following:\n"
+"[%%commands]\n"
+"\n"
+"Use %prog command --help to get more information about a specific command\n"
+"\n"
+"Manipulate a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
+msgid ""
+"[options] file.pdf\n"
+"\n"
+"Crop a PDF file.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:38
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:41
+msgid ""
+"Path to output file. By default a file is created in the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:41
+msgid "Number of pixels to crop from the left most x (default is %s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:44
+msgid "Number of pixels to crop from the left most y (default is %s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47
+msgid "Number of pixels to crop from the right most x (default is %s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50
+msgid "Number of pixels to crop from the right most y (default is %s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53
+msgid ""
+"A file generated by ghostscript which allows each page to be individually "
+"cropped `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
+msgid "Crop Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
+msgid "Options to control the transformation of pdf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+msgid ""
+"[options] file.pdf password\n"
+"\n"
+"Decrypt a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+msgid "Decrypt Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+msgid ""
+"[options] file.pdf password\n"
+"\n"
+"Encrypt a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+msgid "Encrypt Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
+msgid ""
+"file.pdf ...\n"
+"\n"
+"Get info about a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+msgid "Subject"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
+msgid "Creator"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
+msgid "Pages"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
+msgid "File Size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
+msgid "PDF Version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
+msgid ""
+"[options] file1.pdf file2.pdf ...\n"
+"\n"
+"Metadata will be used from the first PDF specified.\n"
+"\n"
+"Merges individual PDFs.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
+msgid "Merge Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+msgid ""
+"[options] file.pdf\n"
+"\n"
+"Reverse a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+msgid "Reverse Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+msgid ""
+"file.pdf degrees\n"
+"\n"
+"Rotate pages of a PDF clockwise.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+msgid "Rotate Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
+msgid ""
+"\n"
+"%prog %%name [options] file.pdf page_to_split_on ...\n"
+"%prog %%name [options] file.pdf page_range_to_split_on ...\n"
+"\t\n"
+"Ex.\n"
+"\t\n"
+"%prog %%name file.pdf 6\n"
+"%prog %%name file.pdf 6-12\n"
+"%prog %%name file.pdf 6-12 8 10 9-20\n"
+"\n"
+"Split a PDF.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
+msgid "Split Options:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31
+msgid ""
+"The unit of measure. Default is inch. Choices are %s Note: This does not "
+"override the unit for margins!"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36
+msgid ""
+"The size of the paper. This size will be overridden when an output profile "
+"is used. Default is letter. Choices are %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40
+msgid ""
+"Custom size of the document. Use the form widthxheight EG. `123x321` to "
+"specify the width and height. This overrides any specified paper-size."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
+msgid "The orientation of the page. Default is portrait. Choices are %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
+msgid ""
+"Preserve the aspect ratio of the cover, instead of stretching it to fill the "
+"ull first page of the generated pdf."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
+msgid "Could not find pdftohtml, check it is in your PATH"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:33
+msgid ""
+"Specify the character encoding of the output document. The default is cp1252."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:199
+msgid ""
+"This RTF file has a feature calibre does not support. Convert it to HTML "
+"first and then try it.\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23
+msgid ""
+"Specify the character encoding of the output document. The default is utf-8."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:27
+msgid ""
+"Specify the compression level to use. Scale 1 - 10. 1 being the lowest "
+"compression but the fastest and 10 being the highest compression but the "
+"slowest."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+msgid ""
+"Normally extra spaces are condensed into a single space. With this option "
+"all spaces will be displayed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+msgid ""
+"Run the text input through the markdown pre-processor. To learn more about "
+"markdown see"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+msgid "Do not insert a Table of Contents into the output text."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24
+msgid ""
+"Type of newline to use. Options are %s. Default is 'system'. Use 'old_mac' "
+"for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. "
+"'system' will default to the newline type used by this OS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:30
+msgid ""
+"Specify the character encoding of the output document. The default is utf-8. "
+"Note: This option is not honored by all formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:38
+msgid ""
+"The maximum number of characters per line. This splits on the first space "
+"before the specified value. If no space is found the line will be broken at "
+"the space after and will exceed the specified value. Also, there is a "
+"minimum of 25 characters. Use 0 to disable line splitting."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:45
+msgid ""
+"Force splitting on the max-line-length value when no space is present. Also "
+"allows max-line-length to be below the minimum"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+msgid "Send file to storage card instead of main memory by default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+msgid "Confirm before deleting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+msgid "Toolbar icon size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+msgid "Show button labels in the toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+msgid "Main window geometry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+msgid "Notify when a new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+msgid "Use Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+msgid "Number of covers to show in the cover browsing mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+msgid "Options for the LRF ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Formats that are viewed using the internal viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Columns to be displayed in the book list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+msgid "Automatically launch content server on application startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
+msgid "Oldest news kept in database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+msgid ""
+"Show the cover flow in a separate window instead of in the main calibre "
+"window"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
+msgid "Disable notifications from the system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+msgid "Maximum number of waiting worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+msgid "Download social metadata (tags/rating/etc.)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+msgid "Overwrite author and title with new metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+msgid "Limit max simultaneous jobs to number of CPUs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+msgid "tag browser categories not to display"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
+msgid "Copied"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+msgid "Copy"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+msgid "Copy to Clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
+msgid "Choose Files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
+msgid "Searching in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
+msgid "Adding..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
+msgid "Searching in all sub-directories..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
+msgid "Added"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
+msgid "Adding failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:341
+msgid ""
+"The add books process seems to have hung. Try restarting calibre and adding "
+"the books in smaller increments, until you find the problem book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+msgid "Duplicates found!"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:354
+msgid ""
+"Books with the same title as the following already exist in the database. "
+"Add them anyway?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
+msgid "Adding duplicates..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
+msgid "Saving..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
+msgid "Saved"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
+msgid "Searching for sub-folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
+msgid "Searching for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
+msgid "Looking for duplicates based on file hash"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
+msgid "Choose root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
+msgid "Invalid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
+msgid "is not a valid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
+msgid "Add books to calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
+msgid "WizardPage"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
+msgid "Scanning root folder for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
+msgid "This may take a few minutes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
+msgid "Choose the location to add books from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
+msgid "Select a folder on your hard disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
+msgid ""
+"<p>calibre can scan your computer for existing books automatically. These "
+"books will then be <b>copied</b> into the calibre library. This wizard will "
+"help you customize the scanning and import process for your existing book "
+"collection.</p>\n"
+"<p>Choose a root folder. Books will be searched for only inside this folder "
+"and any sub-folders.</p>\n"
+"<p>Make sure that the folder you chose for your calibre library <b>is "
+"not</b> under the root folder you choose.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
+msgid "&Root folder:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
+msgid ""
+"This folder and its sub-folders will be scanned for books to import into "
+"calibre's library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
+msgid "..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:67
+msgid "Handle multiple files per book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
+msgid ""
+"&One book per folder, assumes every ebook file in a folder is the same book "
+"in a different format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
+msgid ""
+"&Multiple books per folder, assumes every ebook file is a different book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+msgid "CSV/XML Options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17
+msgid "Options specific to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17
+msgid "output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:107
+msgid "Form"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+msgid "Fields to include in output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+msgid "E-book options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
+msgid "Catalog"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+msgid "'Don't include this book' tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+msgid "'Mark this book as read' tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+msgid "Additional note tag prefix:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+msgid "Regex pattern describing tags to exclude as genres:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+msgid ""
+"Regex tips:\n"
+"- The default regex - \\[[\\w ]*\\] - excludes genre tags of the form [tag], "
+"e.g., [Amazon Freebie]\n"
+"- A regex pattern of a single dot excludes all genre tags, generating no "
+"Genre Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+msgid "Include 'Titles' Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+msgid "Include 'Recently Added' Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+msgid "Sort numbers as text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+msgid "Tab template for catalog.ui"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:36
+msgid ""
+"For settings that cannot be specified in this dialog, use the values saved "
+"in a previous conversion (if they exist) instead of using the defaults "
+"specified in the Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
+msgid "Bulk Convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:185
+msgid "Options specific to the output format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
+msgid "Comic Input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13
+msgid "input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
+msgid "&Number of Colors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
+msgid "Disable &normalize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
+msgid "Keep &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
+msgid "Disable &Sharpening"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
+msgid "Disable &Trimming"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
+msgid "&Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
+msgid "&Landscape"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
+msgid "&Right to left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
+msgid "Don't so&rt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
+msgid "De&speckle"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
+msgid "&Disable comic processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:111
+msgid "&Output format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
+msgid "Disable conversion of images to &black and white"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
+msgid "Debug"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
+msgid "Debug the conversion process."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:51
+msgid "Choose debug folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
+msgid "Invalid debug directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
+msgid "Failed to create debug directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:50
+msgid ""
+"Choose a folder to put the debug output into. If you specify a folder, "
+"calibre will place a lot of debug output into it. This will be useful in "
+"understanding the conversion process and figuring out the correct values for "
+"conversion parameters like Table of Contents and Chapter Detection."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
+msgid ""
+"The debug process outputs the intermediate HTML generated at various stages "
+"of the conversion process. This HTML can sometimes serve as a good starting "
+"point for hand editing a conversion."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
+msgid "EPUB Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
+msgid "Do not &split on page breaks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
+msgid "No default &cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
+msgid "No &SVG cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
+msgid "Preserve cover &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
+msgid "Split files &larger than:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
+msgid " KB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
+msgid "FB2 Input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:29
+msgid "Do not insert a &Table of Contents at the beginning of the book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
+msgid "FB2 Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:47
+msgid "&Inline TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
+msgid "Font rescaling wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:100
+msgid ""
+"<p>This wizard will help you choose an appropriate font size key for your "
+"needs. Just enter the base font size of the input document and then enter an "
+"input font size. The wizard will display what font size it will be mapped "
+"to, by the font rescaling algorithm. You can adjust the algorithm by "
+"adjusting the output base font size and font key below. When you find values "
+"suitable for you, click OK.</p>\n"
+"<p>By default, if the output base font size is zero and/or no font size key "
+"is specified, calibre will use the values from the current Output Profile. "
+"</p>\n"
+"<p>See the <a href=\"http://calibre-"
+"ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> "
+"for a discussion of how font size rescaling works.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
+msgid "&Output document"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109
+msgid "&Base font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
+msgid "Font size &key:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127
+msgid " pt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
+msgid "Use &default values"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
+msgid "&Input document"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
+msgid "&Font size: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
+msgid " will map to size: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
+msgid "0.0 pt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
+msgid "Look & Feel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
+msgid "Control the look and feel of the output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
+msgid "Original"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
+msgid "Left align"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
+msgid "Justify text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
+msgid "&Disable font size rescaling"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
+msgid "Base &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
+msgid "Wizard to help you choose an appropriate font size key"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
+msgid "Line &height:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
+msgid "Input character &encoding:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
+msgid "Remove &spacing between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
+msgid "Indent size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
+msgid ""
+"<p>When calibre removes inter paragraph spacing, it automatically sets a "
+"paragraph indent, to ensure that paragraphs can be easily distinguished. "
+"This option controls the width of that indent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
+msgid " em"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
+msgid "Text justification:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
+msgid "&Linearize tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
+msgid "Extra &CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
+msgid "&Transliterate unicode characters to ASCII"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
+msgid "Insert &blank line"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
+msgid "Keep &ligatures"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
+msgid "LRF Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
+msgid "Enable &autorotation of wide images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
+msgid "&Wordspace:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
+msgid "Minimum para. &indent:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
+msgid "Render &tables as images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:122
+msgid "Text size multiplier for text in rendered tables:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
+msgid "Add &header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
+msgid "Header &separation:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
+msgid "Header &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
+msgid "&Embed fonts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
+msgid "&Serif font family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
+msgid "S&ans-serif font family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
+msgid "&Monospaced font family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195
+msgid "Metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:43
+msgid ""
+"Set the metadata. The output file will contain as much of this metadata as "
+"possible."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:101
+msgid "Choose cover for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:108
+msgid "Cannot read"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109
+msgid "You do not have permission to read the file: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
+msgid "Error reading file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+msgid "<p>There was an error reading from file: <br /><b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126
+msgid " is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
+msgid "Book Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
+msgid "Use cover from &source file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
+msgid "Change &cover image:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
+msgid "Browse for an image to use as the cover of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+msgid "&Title: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+msgid "Change the title of this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+msgid "&Author(s): "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
+msgid "Author So&rt:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by a "
+"comma"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+msgid "&Publisher: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+msgid "Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+msgid ""
+"Tags categorize the book. This is particularly useful while searching. "
+"<br><br>They can be any words or phrases, separated by commas."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+msgid "&Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+msgid "List of known series. You can add new series."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
+msgid "Book "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
+msgid "MOBI Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
+msgid "Default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
+msgid "&Title for Table of Contents:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
+msgid "Rescale images for &Palm devices"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
+msgid "Use author &sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
+msgid "Disable compression of the file contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71
+msgid "Do not add Table of Contents to book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
+msgid "Kindle options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
+msgid "Periodical masthead font:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
+msgid "Personal Doc tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
+msgid "Page Setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
+msgid "&Output profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
+msgid "Profile description"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
+msgid "&Input profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
+msgid "Margins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
+msgid "&Left:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
+msgid "&Top:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
+msgid "&Right:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
+msgid "&Bottom:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
+msgid "PDB Input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
+msgid "Treat each &line as a paragraph"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+msgid "Assume print formatting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
+msgid "PDB Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
+msgid "&Format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
+msgid "PDF Input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
+msgid "Line &Un-Wrapping Factor:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
+msgid "No &Images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
+msgid "PDF Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
+msgid "&Paper Size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
+msgid "&Orientation:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
+msgid "Preserve &aspect ratio of cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
+msgid "RB Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
+msgid "Cannot build regex using the GUI builder without a book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
+msgid "No formats available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
+msgid "Open book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
+msgid "Regex Builder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
+msgid "Preview"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
+msgid "Regex:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
+msgid "Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
+msgid "Convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
+msgid "Options specific to the input format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:48
+msgid "Dialog"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
+msgid "&Input format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
+msgid "Use &saved conversion settings for individual books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
+msgid ""
+"Structure\n"
+"Detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:19
+msgid ""
+"Fine tune the detection of chapter headings and other document structure."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
+msgid "Detect chapters at (XPath expression):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
+msgid "Insert page breaks before (XPath expression):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
+msgid "Header regular expression:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
+msgid "Footer regular expression:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
+msgid "Invalid regular expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
+msgid "Invalid regular expression: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:38
+msgid "Invalid XPath"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39
+msgid "The XPath expression %s is invalid."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
+msgid "Chapter &mark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
+msgid "Remove first &image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
+msgid "Insert &metadata as page at start of book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
+msgid "&Preprocess input file to possibly improve structure detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
+msgid "Remove F&ooter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
+msgid "Remove H&eader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
+msgid ""
+"Table of\n"
+"Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18
+msgid "Control the creation/conversion of the Table of Contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
+msgid "Level &1 TOC (XPath expression):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
+msgid "Level &2 TOC (XPath expression):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
+msgid "Level &3 TOC (XPath expression):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+msgid "Do not add &detected chapters to the Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+msgid "Number of &links to add to Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+msgid "Chapter &threshold"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+msgid "&Force use of auto-generated Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
+msgid "TOC &Filter:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
+msgid "TXT Input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
+msgid "Process using markdown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
+msgid ""
+"<p>Markdown is a simple markup language for text files, that allows for "
+"advanced formatting. To learn more visit <a "
+"href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
+msgid "Do not insert Table of Contents into output text when using markdown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
+msgid "Preserve &spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
+msgid "TXT Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
+msgid "&Line ending style:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
+msgid "&Maximum line length:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
+msgid "Force maximum line lenght"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:50
+msgid "TextLabel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
+msgid "Use a wizard to help construct the XPath expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+msgid "Match HTML &tags with tag name:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+msgid "*"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+msgid "a"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+msgid "br"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+msgid "div"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+msgid "h1"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+msgid "h2"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+msgid "h3"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+msgid "h4"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+msgid "h5"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+msgid "h6"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+msgid "hr"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+msgid "span"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+msgid "Having the &attribute:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+msgid "With &value:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+msgid "(A regular expression)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+msgid ""
+"<p>For example, to match all h2 tags that have class=\"chapter\", set tag to "
+"<i>h2</i>, attribute to <i>class</i> and value to "
+"<i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and "
+"leaving value blank will match any value. Setting tag to * will match any "
+"tag.</p><p>To learn more advanced usage of XPath see the <a "
+"href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242
+msgid "Undefined"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
+msgid "Yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
+msgid "No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
+msgid "No details available."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
+msgid "Device no longer connected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
+msgid "Get device information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
+msgid "Get list of books on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
+msgid "Get annotations from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
+msgid "Send metadata to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
+msgid "Upload %d books to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
+msgid "Delete books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
+msgid "Download books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
+msgid "View book on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
+msgid "Send to storage card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
+msgid "Send to storage card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Main Memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Fetch annotations (experimental)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
+msgid "Auto convert the following books before sending via email?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
+msgid ""
+"Could not email the following books as no suitable formats were found:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
+msgid "Auto convert the following books before uploading to the device?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
+msgid "Sending catalogs to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found. Convert the book(s) to a format supported by your device first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+msgid "Select available formats and their order for this device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
+msgid "Use sub directories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
+msgid "Fit &cover to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
+msgid "&Previous"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
+msgid "&Next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
+msgid "My Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+msgid "Generate catalog"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
+msgid "Generate catalog for {0} books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
+msgid "Catalog &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:72
+msgid ""
+"Catalog &title (existing catalog with the same title will be replaced):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
+msgid "&Send catalog to device automatically"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
+msgid "Catalog options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
+msgid "Choose Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
+msgid "Set defaults for conversion of comics (CBR/CBZ files)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+msgid "Set options for converting %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
+msgid "&Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
+msgid "&Author(s):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
+msgid "&Profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
+msgid "Edit Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:173
+msgid "%(plugin_type)s %(plugins)s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
+msgid "plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
+msgid ""
+"\n"
+"Customization: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
+msgid "Conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
+msgid "Add/Save"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
+msgid ""
+"Content\n"
+"Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:224
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
+msgid ""
+"If checked, downloaded news will be automatically mailed <br>to this email "
+"address (provided it is in one of the listed formats)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
+msgid "System port selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
+msgid ""
+"The value <b>%d</b> you have chosen for the content server port is a system "
+"port. Your operating system <b>may</b> not allow the server to run on this "
+"port. To be safe choose a port number larger than 1024."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
+msgid "Failed to install command line tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
+msgid "Command line tools installed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
+msgid "Command line tools installed in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+msgid ""
+"If you move calibre.app, you have to re-install the command line tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
+msgid "Customize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+msgid "Do you really want to delete column %s and all its data?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
+msgid "Error log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
+msgid "Access log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
+msgid "Failed to start content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
+msgid "Select location for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+msgid "Invalid database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
+msgid "Invalid database location "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
+msgid "Invalid database location.<br>Cannot write to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
+msgid ""
+"The changes you made require that Calibre be restarted. Please restart as "
+"soon as practical."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
+msgid "Checking database integrity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
+msgid "Failed to check database integrity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
+msgid "Some inconsistencies found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
+msgid ""
+"The following books had formats listed in the database that are not actually "
+"available. The entries for the formats have been removed. You should check "
+"them manually. This can happen if you manipulate the files in the library "
+"folder directly."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+msgid "TabWidget"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+msgid ""
+"Here you can control how calibre will read metadata from the files you add "
+"to it. calibre can either read metadata from the contents of the file, or "
+"from the filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+msgid "Read metadata only from &file name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+msgid ""
+"Swap the firstname and lastname of the author. This affects only metadata "
+"read from file names."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+msgid "&Swap author firstname and lastname"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+msgid ""
+"If an existing book with a similar title and author is found that does not "
+"have the format being added, the format is added \n"
+"to the existing book, instead of creating a new entry. If the existing book "
+"already has the format, then it is silently ignored.\n"
+"\n"
+"Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), "
+"punctuation, case, etc. Author match is exact."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+msgid ""
+"If books with similar titles and authors found, &merge the new files "
+"automatically"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+msgid "&Configure metadata from file name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+msgid "&Adding books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+msgid ""
+"Here you can control how calibre will save your books when you click the "
+"Save to Disk button:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+msgid "Save &cover separately"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+msgid "Update &metadata in saved copies"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+msgid "Save metadata in &OPF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+msgid "Convert non-English characters to &English equivalents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+msgid "Format &dates as:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+msgid "File &formats to save:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+msgid "Replace space with &underscores"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+msgid "Change paths to &lowercase"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+msgid "&Saving books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+msgid ""
+"Here you can control how calibre will save your books when you click the "
+"Send to Device button. This setting can be overriden for individual devices "
+"by customizing the device interface plugins in Preferences->Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+msgid "Sending to &device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
+msgid "Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid ""
+"&Location of ebooks (The ebooks are stored in folders sorted by author and "
+"metadata is stored in the file metadata.db)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+msgid "Browse for the new database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+msgid "Show notification when &new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+msgid "Download &social metadata (tags/ratings/etc.) by default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+msgid "&Overwrite author and title by default when fetching metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+msgid "Default network &timeout:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+msgid ""
+"Set the default timeout for network fetches (i.e. anytime we go out to the "
+"internet to get information)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+msgid " seconds"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+msgid "Choose &language (requires restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+msgid "Normal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+msgid "High"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+msgid "Low"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+msgid "Job &priority:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Preferred &output format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+msgid "Preferred &input format order:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Use &Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+msgid "Show &notifications in system tray"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+msgid "Show &splash screen at startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+msgid "Show cover &browser in a separate window (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+msgid "Search as you type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+msgid "&Delete news from library when it is automatically sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+msgid "Toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+msgid "Large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+msgid "Medium"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+msgid "Small"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+msgid "&Button size in toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+msgid "Show &text in toolbar buttons"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+msgid "Select visible &columns in library view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+msgid "Use internal &viewer for:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+msgid ""
+"calibre can send your books to you (or your reader) by email. Emails will be "
+"automatically sent for downloaded news to all email addresses that have Auto-"
+"send checked."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+msgid "&Maximum number of waiting worker processes (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+msgid "&Check database integrity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+msgid "&Install command line tools"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Open calibre &configuration directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Limit the max. simultaneous jobs to the available CPU &cores"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "Debug &device detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid ""
+"calibre contains a network server that allows you to access your book "
+"collection using a browser from anywhere in the world. Any changes to the "
+"settings will only take effect after a server restart."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "Server &port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+msgid ""
+"If you leave the password blank, anyone will be able to access your book "
+"collection using the web interface."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
+msgid "&Show password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+msgid "Max. &OPDS items per query:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+msgid "Max. OPDS &ungrouped items:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+msgid "&Start Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+msgid "St&op Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+msgid "&Test Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+msgid "Run server &automatically on startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+msgid "View &server logs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
+msgid ""
+"<p>Remember to leave calibre running as the server only runs as long as "
+"calibre is running.\n"
+"<p>Stanza should see your calibre collection automatically. If not, try "
+"adding the URL http://myhostname:8080 as a new catalog in the Stanza reader "
+"on your iPhone. Here myhostname should be the fully qualified hostname or "
+"the IP address of the computer calibre is running on."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+msgid "Create Tag-based Column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+msgid "Lookup name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+msgid "Column heading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+msgid "Column type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+msgid "Use brackets"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+msgid "Values can be edited"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+msgid "Text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+msgid "Number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+msgid "Tag on book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+msgid "Explanation text added in create_ct_column.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+msgid "Create and edit tag-based columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
+msgid "Comma separated text, like tags, shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
+msgid "Long text, like comments, not shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
+msgid ""
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
+msgid ""
+"The lookup name must be lower case and cannot contain \":\"s or spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:117
+msgid "Create or edit custom columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
+msgid "&Lookup name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
+msgid "Column &heading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:104
+msgid ""
+"Used for searching the column. Must contain only digits and lower case "
+"letters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
+msgid ""
+"Column heading in the library view and category name in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
+msgid "Column &type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
+msgid "What kind of information will be kept in the column."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
+msgid ""
+"<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's "
+"for year.</p>\n"
+"<p>For example:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy gives 05 January 10</li>\n"
+"</ul> "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
+msgid "Use MMM yyyy for month + year, yyyy for year only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
+msgid "Default: dd MMM yyyy."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
+msgid "Format for &dates"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
+msgid "Getting debug information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
+msgid "Copy to &clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
+msgid "Debug device detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
+msgid "Invalid template"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
+msgid "The template %s is invalid:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+msgid "Save &template"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+msgid ""
+"By adjusting the template below, you can control what folders the files are "
+"saved in and what filenames they are given. You can use the / character to "
+"indicate sub-folders. Available metadata variables are described below. If a "
+"particular book does not have some metadata, the variable will be replaced "
+"by the empty string."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+msgid "Available variables:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
+msgid "Downloading social metadata, please wait..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+msgid "ERROR"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
+msgid "Author Sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
+msgid "ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
+msgid "Finding metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
+msgid "Could not find metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:180
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
+msgid "No metadata found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:195
+msgid ""
+"No metadata found, try adjusting the title and author or the ISBN key."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+msgid "Fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+msgid ""
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+msgid "&Access Key:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+msgid "Fetch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+msgid "Matches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+msgid ""
+"Select the book that most closely matches your copy from the list below"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+msgid "Download &social metadata (tags/rating/etc.) for the selected book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+msgid "Overwrite author and title with author and title of selected book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
+msgid "Details of job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
+msgid "Active Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
+msgid "&Stop selected job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
+msgid "Show job &details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
+msgid "Stop &all jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:24
+msgid "Editing meta information for <b>%d books</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
+msgid "Edit Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+msgid "Author s&ort: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+msgid ""
+"Specify how the author(s) of this book should be sorted. For example Charles "
+"Dickens should be sorted as Dickens, Charles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
+msgid "&Rating:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+msgid "Rating of this book. 0-5 stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+msgid "No change"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
+msgid " stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
+msgid "Add ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+msgid "Open Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
+msgid "&Remove tags:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
+msgid "Comma separated list of tags to remove from the books. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
+msgid "Remove &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
+msgid "&Swap title and author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
+msgid ""
+"Selected books will be automatically numbered,\n"
+"in the order you selected them.\n"
+"So if you selected Book A and then Book B,\n"
+"Book A will have series number 1 and Book B series number 2."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
+msgid "Automatically number books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
+msgid ""
+"Remove stored conversion settings for the selected books.\n"
+"\n"
+"Future conversion of these books will use the default settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
+msgid "Remove &stored conversion settings for the selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412
+msgid "&Basic metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
+msgid "&Custom metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
+msgid "Not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+msgid "Choose formats for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
+msgid "No permission"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:168
+msgid "You do not have permission to read the following files:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
+msgid "No format selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:207
+msgid "Could not read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:208
+msgid "Could not read metadata from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
+msgid "Could not read cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:257
+msgid "Could not read cover from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
+msgid "The cover in the %s format is invalid"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
+msgid "Abort the editing of all remaining books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+msgid "This ISBN number is valid"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
+msgid "This ISBN number is invalid"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
+msgid "Downloading cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+msgid "Cannot fetch cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+msgid "<b>Could not fetch cover.</b><br/>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
+msgid "Could not find cover for this book. Try specifying the ISBN first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
+msgid "There were errors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
+msgid "There were errors downloading social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
+msgid "Permission denied"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
+msgid "Could not open %s. Is it being used by another program?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+msgid "Edit Meta Information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+msgid "Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+msgid "Swap the author and title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+msgid "Author S&ort: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+msgid ""
+"Automatically create the author sort entry based on the current author entry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+msgid "Remove unused series (Series that have no books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
+msgid "IS&BN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+msgid "Publishe&d:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
+msgid "dd MMM yyyy"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+msgid "&Date:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+msgid "&Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+msgid "&Fetch metadata from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+msgid "Available Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
+msgid "Add a new format for this book to the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
+msgid "Remove the selected formats for this book from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
+msgid "Set the cover for the book from the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
+msgid "Update metadata from the metadata in the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
+msgid "Reset cover to default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411
+msgid "Download &cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
+msgid "Password needed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
+msgid "Aborting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54
+msgid ""
+"The current saved search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
+msgid "Need username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
+msgid "You must provide a username and/or password to use this news source."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
+msgid "Last downloaded: never"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
+msgid "%d days, %d hours and %d minutes ago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
+msgid "Last downloaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
+msgid "Schedule news download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
+msgid "Add a custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
+msgid "Download all scheduled new sources"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
+msgid "No internet connection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
+msgid "Cannot download news as no internet connection is active"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
+msgid "Recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
+msgid "Download all scheduled recipes at once"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
+msgid "Download &all scheduled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
+msgid "blurb"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
+msgid "&Schedule for download:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
+msgid "Every "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
+msgid "day"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
+msgid "Monday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
+msgid "Tuesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
+msgid "Wednesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
+msgid "Thursday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
+msgid "Friday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
+msgid "Saturday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
+msgid "Sunday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
+msgid "at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209
+msgid ""
+"Interval at which to download this recipe. A value of zero means that the "
+"recipe will be downloaded every hour."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+msgid " days"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
+msgid "&Account"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
+msgid "For the scheduling to work, you must leave calibre running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
+msgid "&Schedule"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
+msgid "Add &title as tag"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
+msgid "&Extra  tags:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
+msgid "&Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
+msgid "&Download now"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
+msgid ""
+"Delete downloaded news older than the specified number of days. Set to zero "
+"to disable."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
+msgid "Delete downloaded news older than "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
+msgid "contains"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
+msgid "The text to search for. It is interpreted as a regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
+msgid ""
+"<p>Negate this match. That is, only return results that <b>do not</b> match "
+"this query."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
+msgid "Negate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
+msgid "Advanced Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
+msgid "Find entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
+msgid "&All these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
+msgid "This exact &phrase:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
+msgid "&One or more of these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
+msgid "But dont show entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
+msgid "Any of these &unwanted words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
+msgid "What kind of match to use:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121
+msgid "Contains: the word or phrase matches anywhere in the metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:122
+msgid "Equals: the word or phrase must match an entire metadata field"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123
+msgid ""
+"Regular expression: the expression must match anywhere in the metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
+msgid " "
+msgstr " "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:125
+msgid ""
+"See the <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
+"interface\">User Manual</a> for more help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
+msgid "Choose formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
+msgid " (not on any book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
+msgid ""
+"The current tag category will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
+msgid "User Categories Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
+msgid "A&vailable items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
+msgid "Apply tags to current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
+msgid "A&pplied items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
+msgid "Unapply (remove) tag from current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
+msgid "Category name: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
+msgid "Select a category to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
+msgid "Delete this selected tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
+msgid "Enter a new category name. Select the kind before adding it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
+msgid "Add the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
+msgid "Category filter: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
+msgid "Select the content kind of the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:93
+msgid "Are your sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
+msgid ""
+"The following tags are used by one or more books. Are you certain you want "
+"to delete them?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+msgid "A&vailable tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+msgid ""
+"Delete tag from database. This will unapply the tag from all books and then "
+"remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+msgid "Apply tag to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+msgid "A&pplied tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+msgid "Unapply (remove) tag from current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+msgid "&Add tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+msgid ""
+"If the tag you want is not in the available list, you can add it here. "
+"Accepts a comma separated list of tags."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+msgid "Add tag to available tags and apply it to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
+msgid "Item is blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
+msgid "Item already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
+msgid "The item %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
+msgid "No item selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
+msgid "You must select one item from the list of Available items."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
+msgid "No items selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
+msgid "You must select at least one items from the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
+msgid "Are you certain you want to delete the following items?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Category Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+msgid "Rename the item in every book where it is used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
+msgid "Ctrl+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
+msgid "Test email settings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
+msgid "Send test mail from %s to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+msgid "&Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
+msgid "No recipe selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
+msgid "The attached file: %s is a recipe to download %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
+msgid "Recipe for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+msgid "Switch to Advanced mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
+msgid "Switch to Basic mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
+msgid "Feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
+msgid "The feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
+msgid "Feed must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
+msgid "The feed %s must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
+msgid "Already exists"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186
+msgid "This feed has already been added to the recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:286
+msgid "Invalid input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:287
+msgid "<p>Could not create recipe. Error:<br>%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:290
+msgid "Replace recipe?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:291
+msgid "A custom recipe named %s already exists. Do you want to replace it?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
+msgid "Pick recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
+msgid "Pick the recipe to customize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
+msgid "Choose a recipe file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+msgid "Add custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+msgid "Available user recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+msgid "Add/Update &recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+msgid "&Remove recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+msgid "&Share recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+msgid "Customize &builtin recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+msgid "&Load recipe from file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news "
+"recipe, by adding RSS feeds to it. <br />For most feeds, you will have to "
+"use the \"Advanced mode\" to further customize the fetch "
+"process.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+msgid "Recipe &title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+msgid "&Oldest article:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+msgid "The oldest article to download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+msgid "&Max. number of articles per feed:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+msgid "Maximum number of articles to download per feed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+msgid "Feeds in recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+msgid "Remove feed from recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+msgid "Add feed to recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+msgid "&Feed title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+msgid "Feed &URL:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+msgid "&Add feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+msgid ""
+"For help with writing advanced news recipes, please visit <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+msgid "Recipe source code (python)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Candara'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Set a regular expression "
+"pattern to use when trying to guess ebook metadata from filenames. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
+"of regular expressions is available.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
+"font-weight:600;\">Test</span> functionality below to test your regular "
+"expression on a few sample filenames. The group names for the various "
+"metadata entries are documented in tooltips.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+msgid "Regular &expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
+msgid "File &name:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
+msgid "Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+msgid "Regular expression (?P&lt;title&gt;)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
+msgid "No match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+msgid "Authors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+msgid "Regular expression (?P<author>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+msgid "Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
+msgid "Regular expression (?P<series>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+msgid "Series index:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
+msgid "Regular expression (?P<series_index>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+msgid "ISBN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
+msgid "Regular expression (?P<isbn>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
+msgid "Job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
+msgid "Status"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
+msgid "Progress"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
+msgid "Running time"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+msgid "There are %d running jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
+msgid "Unknown job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
+msgid "There are %d waiting jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
+msgid "Cannot kill job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
+msgid "Cannot kill jobs that communicate with the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
+msgid "Job has already run"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
+msgid "Unavailable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
+msgid " - Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "N"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "Y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
+msgid "Size (MB)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
+msgid "Rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
+msgid "Size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
+msgid "Configure Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
+msgid "Use white background"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
+msgid "Hyphenate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
+msgid "<b>Changes will only take effect after a restart.</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
+msgid " - LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
+msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:440
+msgid "No matches found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
+msgid "LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
+msgid "Parsing LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
+msgid "LRF Viewer toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:476
+msgid "Next Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:477
+msgid "Previous Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:188
+msgid "Back"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189
+msgid "Forward"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
+msgid "Next match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196
+msgid "Open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
+msgid "Configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
+msgid "Use the library located at the specified path."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
+msgid "Start minimized to system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
+msgid "Log debugging information to console"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
+msgid "Do not check for updates"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
+msgid "Calibre Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
+msgid "Choose a location for your new calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
+msgid "Bad database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
+msgid "Bad database location %r. calibre will now quit."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
+msgid "Corrupted database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+msgid ""
+"Your calibre database appears to be corrupted. Do you want calibre to try "
+"and repair it automatically? If you say No, a new empty calibre library will "
+"be created."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+msgid ""
+"Repairing database. This can take a very long time for a large collection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
+msgid ""
+"Bad database location %r. Will start with  a new, empty calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+msgid "If you are sure it is not running"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+msgid "Cannot Start "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
+msgid "%s is already running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
+msgid "may be running in the system tray, in the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
+msgid "upper right region of the screen."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
+msgid "lower right region of the screen."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
+msgid "try rebooting your computer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
+msgid "try deleting the file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+msgid "calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+msgid "Alt+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+msgid "&Search:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+msgid "Reset Quick Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+msgid "Copy current search text (instead of search name)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+msgid "Save current search under the name shown in the box"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+msgid "Delete current saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+msgid "Add books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+msgid "A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+msgid "Remove books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+msgid "Del"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+msgid "Edit meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+msgid "E"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+msgid "M"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+msgid "Send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+msgid "Fetch news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+msgid "Convert E-books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+msgid "Configure calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+msgid "Ctrl+P"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
+msgid ""
+"Redirect console output to a dialog window (both stdout and stderr). Useful "
+"on windows where GUI apps do not have a output streams."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
+msgid "&Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
+msgid "&Quit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
+msgid "ERROR: Unhandled exception"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
+msgid "Book has neither title nor ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
+msgid "No matches found for this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
+msgid "Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
+msgid "Press a key..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
+msgid "Already assigned"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
+msgid "already assigned to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
+msgid " or "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
+msgid "&Default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
+msgid "Customize shortcuts for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
+msgid "Keys"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
+msgid "Double click to change"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
+msgid "Frame"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
+msgid "&Custom"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
+msgid "&Shortcut:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77
+msgid "Click to change"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
+msgid "Clear"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
+msgid "&Alternate shortcut:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
+msgid "Show all categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
+msgid "Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
+msgid "Convert book %d of %d (%s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
+msgid "Could not convert some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
+msgid ""
+"Could not convert %d of %d books, because no suitable source format was "
+"found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
+msgid "Queueing books for bulk conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
+msgid "Queueing "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+msgid "Fetch news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+msgid "Convert existing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+msgid ""
+"The following books have already been converted to %s format. Do you wish to "
+"reconvert them?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
+msgid "&Restore"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
+msgid "&Donate to support calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+msgid "&Eject connected device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
+msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
+msgid "Calibre Quick Start Guide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
+msgid "Cannot configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
+msgid "Cannot configure while there are running jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
+msgid "No detailed info available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
+msgid "No detailed information is available for books on the device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
+msgid "Conversion Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
+msgid ""
+"<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
+"first remove the DRM using third party tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
+msgid "Recipe Disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
+msgid "<b>Failed</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
+msgid ""
+"is the result of the efforts of many volunteers from all over the world. If "
+"you find it useful, please consider donating to support its development."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+msgid "There are active jobs. Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
+msgid ""
+" is communicating with the device!<br>\n"
+"                      Quitting may cause corruption on the device.<br>\n"
+"                      Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
+msgid "WARNING: Active jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
+msgid ""
+"will keep running in the system tray. To close it, choose <b>Quit</b> in the "
+"context menu of the system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
+msgid ""
+"<span style=\"color:red; font-weight:bold\">Latest version: <a "
+"href=\"%s\">%s</a></span>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+msgid ""
+"%s has been updated to version %s. See the <a href=\"http://calibre-"
+"ebook.com/whats-new\">new features</a>. Visit the download page?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
+msgid "Edit bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
+msgid "New title for bookmark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
+msgid "Export Bookmarks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
+msgid "Saved Bookmarks (*.pickle)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
+msgid "Import Bookmarks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
+msgid "Pickled Bookmarks (*.pickle)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
+msgid "Name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+msgid "Bookmark Manager"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+msgid "Actions"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+msgid "Edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+msgid "Delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+msgid "Reset"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+msgid "Export"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+msgid "Import"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
+msgid "Configure Ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
+msgid "&Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
+msgid "Se&rif family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
+msgid "&Sans family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
+msgid "&Monospace family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
+msgid "&Default font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:168
+msgid " px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
+msgid "Monospace &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
+msgid "S&tandard font:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
+msgid "Serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
+msgid "Sans-serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
+msgid "Monospace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
+msgid "Remember last used &window size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
+msgid "Maximum &view width:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
+msgid "H&yphenate (break line in the middle of large words)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:171
+msgid ""
+"The default language to use for hyphenation rules. If the book does not "
+"specify a language, this will be used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
+msgid "Default &language for hyphenation:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
+msgid "&Resize images larger than the viewer window (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
+msgid "&User stylesheet"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
+msgid "&General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
+msgid "Double click to change a keyboard shortcut"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
+msgid "&Keyboard shortcuts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
+msgid "No results found for:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
+msgid "Options to customize the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:675
+msgid "Remember last used window size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:81
+msgid ""
+"Set the user CSS stylesheet. This can be used to customize the look of all "
+"books."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
+msgid "Maximum width of the viewer window, in pixels."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
+msgid "Resize images larger than the viewer window to fit inside it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
+msgid "Hyphenate text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
+msgid "Default language for hyphenation rules"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
+msgid "Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
+msgid "The serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
+msgid "The sans-serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
+msgid "The monospaced font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
+msgid "The standard font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
+msgid "The monospaced font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
+msgid "The standard font type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
+msgid "&Lookup in dictionary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138
+msgid "Go to..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
+msgid "Next Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
+msgid "Previous Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
+msgid "Document Start"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
+msgid "Document End"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
+msgid "Section Start"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
+msgid "Section End"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
+msgid "Scroll to the next page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
+msgid "Scroll to the previous page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
+msgid "Scroll to the next section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
+msgid "Scroll to the previous section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
+msgid "Scroll to the bottom of the section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
+msgid "Scroll to the top of the section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
+msgid "Scroll to the end of the document"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
+msgid "Scroll to the start of the document"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
+msgid "Scroll down"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
+msgid "Scroll up"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
+msgid "Scroll left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
+msgid "Scroll right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
+msgid "Book format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
+msgid "Position in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:191
+msgid "Go to a reference. To get reference numbers, use the reference mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
+msgid "Search for text in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
+msgid "Print Preview"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
+msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
+msgid "Choose ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
+msgid "Ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
+msgid "Add bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
+msgid "Enter title for bookmark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
+msgid "No matches found for: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
+msgid "Loading flow..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+msgid "Laying out %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
+msgid "Manage Bookmarks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
+msgid "Loading ebook..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
+msgid "DRM Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
+msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
+msgid "Could not open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
+msgid "Options to control the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:672
+msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
+msgid "Print javascript alert and console messages to the console"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
+msgid ""
+"%prog [options] file\n"
+"\n"
+"View an ebook.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
+msgid "E-book Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
+msgid "Close dictionary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
+msgid "toolBar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
+msgid "Next page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
+msgid "Previous page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
+msgid "Font size larger"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
+msgid "Font size smaller"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
+msgid "Find next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
+msgid "Find next occurrence"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
+msgid "F3"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
+msgid "Copy to clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
+msgid "Reference Mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
+msgid "Bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
+msgid "Toggle full screen"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
+msgid "Print"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
+msgid "Find previous"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
+msgid "Find previous occurrence"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
+msgid "Shift+F3"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
+msgid "Print eBook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
+msgid "Copy Image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
+msgid "Paste Image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+msgid ""
+"Reader\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
+msgid ""
+"Card A\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
+msgid ""
+"Card B\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
+msgid "Click to see the books available on your computer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+msgid "Change Case"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+msgid "Upper Case"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+msgid "Lower Case"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
+msgid "Swap Case"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
+msgid "Title Case"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
+msgid ""
+"If you use the WordPlayer e-book app on your Android phone, you can access "
+"your calibre book collection directly on the device. To do this you have to "
+"turn on the content server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
+msgid ""
+"Remember to leave calibre running as the server only runs as long as calibre "
+"is running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
+msgid ""
+"You have to add the URL http://myhostname:8080 as your calibre library in "
+"WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
+"address of the computer calibre is running on."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
+msgid "Moving library..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
+msgid "Failed to move library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
+msgid "Invalid database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:522
+msgid ""
+"<p>An invalid library already exists at %s, delete it before trying to move "
+"the existing library.<br>Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
+msgid "Could not move library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
+msgid "welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:42
+msgid "Welcome to calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:43
+msgid "The one stop solution to all your e-book needs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:51
+msgid ""
+"Choose your book reader. This will set the conversion options to produce "
+"books optimized for your device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
+msgid "&Manufacturers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
+msgid "&Devices"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
+msgid ""
+"<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
+"button to apply your settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:49
+msgid ""
+"<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
+"available <a href=\"http://calibre-ebook.com/demo\">online</a>."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:50
+msgid ""
+"<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-"
+"ebook.com/user_manual\">online</a>."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:44
+msgid ""
+"<p>calibre can automatically send books by email to your Kindle. To do that "
+"you have to setup email delivery below. The easiest way is to setup a free "
+"<a href=\"http://gmail.com\">gmail account</a> and click the Use gmail "
+"button below. You will also have to register your gmail address in your "
+"Amazon account."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
+msgid "&Kindle email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
+msgid "Choose your &language:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:53
+msgid ""
+"Choose a location for your books. When you add books to calibre, they will "
+"be copied here:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
+msgid "&Change"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:55
+msgid ""
+"If you have an existing calibre library, it will be copied to the new "
+"location. If a calibre library already exists at the new location, calibre "
+"will switch to using it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
+msgid "Using: %s:%s@%s:%s and %s encryption"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
+msgid "Sending..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
+msgid "Mail successfully sent"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:115
+msgid ""
+"Dont forget to enter your gmail username and password. You can sign up for a "
+"free gmail account at http://gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:130
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:131
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:109
+msgid ""
+"<p>This is what will be present in the From: field of emails sent by "
+"calibre.<br> Set it to your email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:112
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:116
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:123
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
+msgid "&Test email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:44
+msgid ""
+"<p>If you use the <a href=\"http://www.lexcycle.com/download\">Stanza</a> e-"
+"book app on your iPhone/iTouch, you can access your calibre book collection "
+"directly on the device. To do this you have to turn on the calibre content "
+"server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
+msgid "Turn on the &content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
+msgid "today"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
+msgid "yesterday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
+msgid "thismonth"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
+msgid "daysago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "no"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "unchecked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "checked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "empty"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
+msgid ""
+"The fields to output when cataloging books in the database.  Should be a "
+"comma-separated list of fields.\n"
+"Available fields: %s.\n"
+"Default: '%%default'\n"
+"Applies to: CSV, XML output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:51
+msgid ""
+"Output field to sort on.\n"
+"Available fields: author_sort, id, rating, size, timestamp, title.\n"
+"Default: '%default'\n"
+"Applies to: CSV, XML output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
+msgid ""
+"Title of generated catalog used as title in metadata.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
+msgid ""
+"Save the output from different stages of the conversion pipeline to the "
+"specified directory. Useful if you are unsure at which stage of the "
+"conversion process a bug is occurring.\n"
+"Default: '%default'None\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
+msgid ""
+"Regex describing tags to exclude as genres.\n"
+"Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
+msgid ""
+"Comma-separated list of tag words indicating book should be excluded from "
+"output.  Case-insensitive.\n"
+"--exclude-tags=skip will match 'skip this book' and 'Skip will like this'.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
+msgid ""
+"Include 'Titles' section in catalog.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
+msgid ""
+"Include 'Recently Added' section in catalog.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
+msgid ""
+"Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
+msgid ""
+"Sort titles with leading numbers as text, e.g.,\n"
+"'2001: A Space Odyssey' sorts as \n"
+"'Two Thousand One: A Space Odyssey'.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
+msgid ""
+"Specifies the output profile.  In some cases, an output profile is required "
+"to optimize the catalog for the device.  For example, 'kindle' or "
+"'kindle_dx' creates a structured Table of Contents with Sections and "
+"Articles.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
+msgid ""
+"Tag indicating book has been read.\n"
+"Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:41
+msgid ""
+"Path to the calibre library. Default is to use the path stored in the "
+"settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
+msgid ""
+"%prog list [options]\n"
+"\n"
+"List the books available in the calibre database.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:128
+msgid ""
+"The fields to display when listing books in the database. Should be a comma "
+"separated list of fields.\n"
+"Available fields: %s\n"
+"Default: %%default. The special field \"all\" can be used to select all "
+"fields. Only has effect in the text output format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:135
+msgid ""
+"The field by which to sort the results.\n"
+"Available fields: %s\n"
+"Default: %%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
+msgid "Sort results in ascending order"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:139
+msgid ""
+"Filter the results by the search query. For the format of the search query, "
+"please see the search related documentation in the User Manual. Default is "
+"to do no filtering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:141
+msgid ""
+"The maximum width of a single line in the output. Defaults to detecting "
+"screen size."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:142
+msgid "The string used to separate fields. Default is a space."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:143
+msgid ""
+"The prefix for all file paths. Default is the absolute path to the library "
+"folder."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
+msgid "Invalid fields. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
+msgid "Invalid sort field. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:244
+msgid ""
+"The following books were not added as they already exist in the database "
+"(see --duplicates option):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:267
+msgid ""
+"%prog add [options] file1 file2 file3 ...\n"
+"\n"
+"Add the specified files as books to the database. You can also specify "
+"directories, see\n"
+"the directory related options below.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:276
+msgid ""
+"Assume that each directory has only a single logical book and that all files "
+"in it are different e-book formats of that book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
+msgid "Process directories recursively"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:280
+msgid ""
+"Add books to database even if they already exist. Comparison is done based "
+"on book titles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:282
+msgid "Add an empty book (a book with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:284
+msgid "Set the title of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:286
+msgid "Set the authors of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:288
+msgid "Set the ISBN of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:313
+msgid "You must specify at least one file to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
+msgid ""
+"%prog remove ids\n"
+"\n"
+"Remove the books identified by ids from the database. ids should be a comma "
+"separated list of id numbers (you can get id numbers by using the list "
+"command). For example, 23,34,57-85\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:344
+msgid "You must specify at least one book to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:363
+msgid ""
+"%prog add_format [options] id ebook_file\n"
+"\n"
+"Add the ebook in ebook_file to the available formats for the logical book "
+"identified by id. You can get id by using the list command. If the format "
+"already exists, it is replaced.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
+msgid "You must specify an id and an ebook file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
+msgid "ebook file must have an extension"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:391
+msgid ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Remove the format fmt from the logical book identified by id. You can get id "
+"by using the list command. fmt should be a file extension like LRF or TXT or "
+"EPUB. If the logical book does not have fmt available, do nothing.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:408
+msgid "You must specify an id and a format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
+msgid ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Show the metadata stored in the calibre database for the book identified by "
+"id.\n"
+"id is an id number from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
+msgid "Print metadata in OPF form (XML)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
+msgid "You must specify an id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
+msgid ""
+"\n"
+"%prog set_metadata [options] id /path/to/metadata.opf\n"
+"\n"
+"Set the metadata stored in the calibre database for the book identified by "
+"id\n"
+"from the OPF file metadata.opf. id is an id number from the list command. "
+"You\n"
+"can get a quick feel for the OPF format by using the --as-opf switch to the\n"
+"show_metadata command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:472
+msgid "You must specify an id and a metadata file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
+msgid ""
+"%prog export [options] ids\n"
+"\n"
+"Export the books specified by ids (a comma separated list) to the "
+"filesystem.\n"
+"The export operation saves all formats of the book, its cover and metadata "
+"(in\n"
+"an opf file). You can get id numbers from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:500
+msgid "Export all books in database, ignoring the list of ids."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
+msgid "Export books to the specified directory. Default is"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:504
+msgid "Export all books into a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:511
+msgid "Specifying this switch will turn this behavior off."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:534
+msgid "You must specify some ids or the %s option"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
+msgid ""
+"%prog add_custom_column [options] label name datatype\n"
+"\n"
+"Create a custom column. label is the machine friendly name of the column. "
+"Should\n"
+"not contain spaces or colons. name is the human friendly name of the "
+"column.\n"
+"datatype is one of: {0}\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:556
+msgid ""
+"This column stores tag like data (i.e. multiple comma separated values). "
+"Only applies if datatype is text."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:560
+msgid ""
+"A dictionary of options to customize how the data in this column will be "
+"interpreted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:573
+msgid "You must specify label, name and datatype"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
+msgid ""
+"\n"
+"    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n"
+"\n"
+"    Export a catalog in format specified by path/to/destination extension.\n"
+"    Options control how entries are displayed in the generated catalog "
+"ouput.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
+msgid ""
+"Comma-separated list of database IDs to catalog.\n"
+"If declared, --search is ignored.\n"
+"Default: all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:649
+msgid ""
+"Filter the results by the search query. For the format of the search query, "
+"please see the search-related documentation in the User Manual.\n"
+"Default: no filtering"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:655
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
+msgid "Show detailed output information. Useful for debugging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:668
+msgid "Error: You must specify a catalog output file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:688
+msgid ""
+"\n"
+"    %prog set_custom [options] column id value\n"
+"\n"
+"    Set the value of a custom column for the book identified by id.\n"
+"    You can get a list of ids using the list command.\n"
+"    You can get a list of custom column names using the custom_columns\n"
+"    command.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:699
+msgid ""
+"If the column stores multiple values, append the specified values to the "
+"existing ones, instead of replacing them."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:710
+msgid "Error: You must specify a field name, id and value"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
+msgid ""
+"\n"
+"    %prog custom_columns [options]\n"
+"\n"
+"    List available custom columns. Shows column labels and ids.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:736
+msgid "Show details for each column."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:748
+msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
+msgid "y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:756
+msgid ""
+"\n"
+"    %prog remove_custom_column [options] label\n"
+"\n"
+"    Remove the custom column identified by label. You can see available\n"
+"    columns with the custom_columns command.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:764
+msgid "Do not ask for confirmation"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:774
+msgid "Error: You must specify a column label"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
+msgid ""
+"%%prog command [options] [arguments]\n"
+"\n"
+"%%prog is the command line interface to the calibre books database.\n"
+"\n"
+"command is one of:\n"
+"  %s\n"
+"\n"
+"For help on an individual command: %%prog command --help\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
+msgid "<p>Migrating old database to ebook library in %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
+msgid "Copying <b>%s</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
+msgid "Compacting database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
+msgid "Checking SQL integrity..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
+msgid "Checking for missing files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
+msgid "Checked id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
+msgid "The title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
+msgid "The authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:26
+msgid ""
+"The author sort string. To use only the first letter of the name use "
+"{author_sort[0]}"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
+msgid "The tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
+msgid "The series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30
+msgid ""
+"The series number. To get leading zeros use {series_index:0>3s} or "
+"{series_index:>3s} for leading spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
+msgid "The rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
+msgid "The ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
+msgid "The publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
+msgid "The date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
+msgid "The published date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
+msgid "The calibre internal id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
+msgid "Options to control saving to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54
+msgid ""
+"Normally, calibre will update the metadata in the saved files from what is "
+"in the calibre library. Makes saving to disk slower."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57
+msgid ""
+"Normally, calibre will write the metadata into a separate OPF file along "
+"with the actual e-book files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:60
+msgid ""
+"Normally, calibre will save the cover in a separate file along with the "
+"actual e-book file(s)."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:63
+msgid ""
+"Comma separated list of formats to save for each book. By default all "
+"available books are saved."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:66
+msgid ""
+"The template to control the filename and directory structure of the saved "
+"files. Default is \"%s\" which will save books into a per-author "
+"subdirectory with filenames containing title and author. Available controls "
+"are: {%s}"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
+msgid ""
+"The template to control the filename and directory structure of files sent "
+"to the device. Default is \"%s\" which will save books into a per-author "
+"directory with filenames containing title and author. Available controls "
+"are: {%s}"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78
+msgid ""
+"Normally, calibre will convert all non English characters into English "
+"equivalents for the file names. WARNING: If you turn this off, you may "
+"experience errors when saving, depending on how well the filesystem you are "
+"saving to supports unicode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:84
+msgid ""
+"The format in which to display dates. %d - day, %b - month, %Y - year. "
+"Default is: %b, %Y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
+msgid "Convert paths to lowercase."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
+msgid "Replace whitespace with underscores."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
+msgid "Requested formats not available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39
+msgid ""
+"The maximum number of matches to return per OPDS query. This affects Stanza, "
+"WordPlayer, etc. integration."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
+msgid "Password to access your calibre library. Username is "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
+msgid ""
+"[options]\n"
+"\n"
+"Start the calibre content server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
+msgid "Path to the library folder to serve with the content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
+msgid "Write process PID to the specified file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
+msgid "%sUsage%s: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
+msgid "Created by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:93
+msgid ""
+"Whenever you pass arguments to %prog that have spaces in them, enclose the "
+"arguments in quotation marks."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
+msgid "Path to the database in which books are stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
+msgid "Pattern to guess metadata from filenames"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
+msgid "Access key for isbndb.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
+msgid "Default timeout for network operations (seconds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
+msgid "Path to directory in which your library of books is stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:680
+msgid "The language in which to display the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:682
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:686
+msgid "Ordered list of formats to prefer for input."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
+msgid "Read metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:692
+msgid "Swap author first and last names when reading metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:694
+msgid "Add new formats to existing book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
+msgid "List of named saved searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:700
+msgid "User-created tag browser categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
+msgid "Waiting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
+msgid "Stopped"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
+msgid "Working..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
+msgid "English (UK)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
+msgid "Simplified Chinese"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
+msgid "Chinese (HK)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
+msgid "Traditional Chinese"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
+msgid "English"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
+msgid "English (Australia)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
+msgid "English (New Zealand)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
+msgid "English (Canada)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
+msgid "English (India)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
+msgid "English (Thailand)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
+msgid "English (Cyprus)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
+msgid "English (Pakistan)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+msgid "English (Singapore)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+msgid "English (Yemen)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+msgid "English (Ireland)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+msgid "English (China)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+msgid "Spanish (Paraguay)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+msgid "German (AT)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+msgid "Dutch (BE)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
+msgid "URL must have the scheme sftp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
+msgid "host must be of the form user@hostname"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
+msgid "Failed to negotiate SSH session: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
+msgid "Failed to authenticate with server: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
+msgid "Control email delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
+msgid "Unknown feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
+msgid "Untitled article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
+msgid "Download periodical content from the internet"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:36
+msgid ""
+"Useful for recipe development. Forces max_articles_per_feed to 2 and "
+"downloads at most 2 feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:39
+msgid "Username for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:42
+msgid "Password for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:46
+msgid ""
+"Do not download latest version of builtin recipes from the calibre server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
+msgid "Unknown News Source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
+msgid "The \"%s\" recipe needs a username and password."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
+msgid "Download finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
+msgid "Failed to download the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
+msgid "Failed to download parts of the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
+msgid " from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
+msgid "\tFailed links:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+msgid "Could not fetch article. Run with -vv to see the reason"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
+msgid "Fetching feeds..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
+msgid "Got feeds from index page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
+msgid "Trying to download cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
+msgid "Generating masthead..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
+msgid "Starting download [%d thread(s)]..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
+msgid "Feeds downloaded to %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
+msgid "Could not download cover: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+msgid "Downloading cover from %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
+msgid "Masthead image downloaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
+msgid "Untitled Article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
+msgid "Article downloaded: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
+msgid "Article download failed: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
+msgid "Fetching feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
+msgid ""
+"Failed to log in, check your username and password for the calibre "
+"Periodicals service."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
+msgid ""
+"You do not have permission to download this issue. Either your subscription "
+"has expired or you have exceeded the maximum allowed downloads for today."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:181
+msgid "Scheduled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:182
+msgid "Custom"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
+msgid ""
+"%prog URL\n"
+"\n"
+"Where URL is for example http://google.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+msgid "Base directory into which URL is saved. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
+msgid ""
+"Timeout in seconds to wait for a response from the server. Default: %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+msgid ""
+"Maximum number of levels to recurse i.e. depth of links to follow. Default "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+msgid ""
+"The maximum number of files to download. This only applies to files from <a "
+"href> tags. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+msgid ""
+"Minimum interval in seconds between consecutive fetches. Default is %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+msgid ""
+"The character encoding for the websites you are trying to download. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+msgid ""
+"Only links that match this regular expression will be followed. This option "
+"can be specified multiple times, in which case as long as a link matches any "
+"one regexp, it will be followed. By default all links are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+msgid ""
+"Any link that matches this regular expression will be ignored. This option "
+"can be specified multiple times, in which case as long as any regexp matches "
+"a link, it will be ignored.By default, no links are ignored. If both --"
+"filter-regexp and --match-regexp are specified, then --filter-regexp is "
+"applied first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
+msgid "Do not download CSS stylesheets."
+msgstr ""
diff --git a/src/calibre/translations/fo.po b/src/calibre/translations/fo.po
index 36a749516f..369fa5033c 100644
--- a/src/calibre/translations/fo.po
+++ b/src/calibre/translations/fo.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-10 22:42+0000\n"
-"Last-Translator: Gunleif Joensen <Unknown>\n"
+"POT-Creation-Date: 2010-06-11 22:51+0000\n"
+"PO-Revision-Date: 2010-06-11 18:48+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Faroese <fo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,8 +27,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -50,10 +50,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
@@ -101,39 +101,39 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:293
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:491
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1303
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:302
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:880
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:917
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1515
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1517
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1639
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
@@ -445,50 +445,50 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:75
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:81
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:214
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:217
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:282
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:318
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:921
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:947
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:325
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:952
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:499
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:703
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:705
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:776
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -576,7 +576,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr ""
 
@@ -654,7 +654,7 @@ msgid ""
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:142
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -710,22 +710,22 @@ msgstr ""
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:775
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:809
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:815
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:843
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:141
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1399
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr ""
@@ -752,44 +752,44 @@ msgstr ""
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr ""
 
@@ -1382,15 +1382,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1703,24 +1703,24 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:848
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:849
 msgid "Author(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr ""
 
@@ -1733,29 +1733,29 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1030
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
 msgid "Series"
 msgstr ""
@@ -1765,13 +1765,13 @@ msgid "Language"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
 msgid "Timestamp"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr ""
 
@@ -2542,20 +2542,24 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:395
 msgid "Choose Files"
 msgstr ""
 
@@ -2580,12 +2584,12 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:608
 msgid "No books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid "No books found"
 msgstr ""
 
@@ -2741,12 +2745,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2845,8 +2849,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1362
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1380
 msgid "Catalog"
 msgstr ""
 
@@ -3527,7 +3531,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
 msgid "Choose the format to view"
 msgstr ""
 
@@ -3611,12 +3615,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3824,11 +3828,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:120
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:172
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3849,243 +3861,247 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:43
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:143
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:248
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:274
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:284
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:293
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:302
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:317
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:334
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
-msgid "Send to storage card A"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+msgid " and delete from library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+msgid "Send to storage card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
-msgid "Main Memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+msgid "Main Memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:441
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:481
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:486
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:494
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:609
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:623
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:626
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:672
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:677
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:690
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:999
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1006
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:721
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:746
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:747
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:751
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:779
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:790
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:820
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1000
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:849
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1007
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1056
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4105,9 +4121,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:99
 msgid "Path"
 msgstr ""
 
@@ -4116,8 +4132,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:100
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
 msgid "Formats"
 msgstr ""
@@ -4277,8 +4293,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
@@ -4366,7 +4382,7 @@ msgid "Access log:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:419
 msgid "Failed to start content server"
 msgstr ""
 
@@ -4534,7 +4550,7 @@ msgid "Sending to &device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
@@ -4879,9 +4895,9 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:850
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
 msgid "Date"
 msgstr ""
@@ -4898,68 +4914,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5275,7 +5292,7 @@ msgid "Choose formats for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:876
 msgid "Books"
 msgstr ""
 
@@ -5317,67 +5334,67 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:449
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:452
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:572
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:562
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:578
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:579
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:613
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:642
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:643
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:714
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:715
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5721,7 +5738,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
-msgstr ""
+msgstr " "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:125
 msgid ""
@@ -5852,12 +5869,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:442
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6149,11 +6166,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6189,54 +6206,198 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:33
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:49
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:57
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:68
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:79
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:81
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1782
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1785
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:116
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:122
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:124
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:145
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:147
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:151
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:192
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:297
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:315
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:336
+msgid "Side bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:366
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:278
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:294
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:354
 msgid " - Jobs"
 msgstr ""
 
@@ -6248,112 +6409,112 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1029
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1033
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1097
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:350
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:847
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:851
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1023
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:101
 msgid "Collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1082
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:504
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:505
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6449,282 +6610,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6754,15 +6886,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:249
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:302
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:344
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:371
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6823,82 +6975,62 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
 msgid "Rename"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:155
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:158
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:162
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:169
 msgid "Manage "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:173
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:184
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:377
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:238
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:451
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:452
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:652
+msgid "Sort by &popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:661
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -6940,193 +7072,59 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:189
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:246
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:485
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:519
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:531
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:532
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7142,210 +7140,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:772
 msgid "Use library only"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:773
 msgid "User annotations generated from main library only"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1214
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1527
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:604
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:629
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:657
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:663
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:682
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:691
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:696
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:816
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:817
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:916
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:878
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:880
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:882
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:883
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:884
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:885
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:886
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:890
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:925
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:926
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:935
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:936
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1696
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:969
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:987
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1061
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1097
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1113
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1117
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1139
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1140
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1143
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1192
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1216
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1217
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1221
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -7353,7 +7351,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1232
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -7363,89 +7361,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1244
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1379
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1410
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1427
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1443
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1446
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1447
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1461
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1555
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1729
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1685
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1686
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -7453,106 +7451,106 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1695
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1730
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1764
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1765
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1818
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1870
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1900
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1928
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1901
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1914
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1929
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1969
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1994
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1997
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2001
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2053
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2072
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2080
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2081
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8019,82 +8017,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8867,27 +8877,27 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1665
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1711
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1804
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1845
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1867
 msgid "Checked id"
 msgstr ""
 
@@ -9340,97 +9350,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:605
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:712
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:831
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:852
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:865
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:946
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:972
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:984
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1024
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1220
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1302
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1319
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1466
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1482
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index 50d862fc64..4fa07711e3 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-07 22:04+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 20:01+0000\n"
 "Last-Translator: sengian <Unknown>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-09 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: 1177,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -24,12 +24,12 @@ msgstr "Ne fait strictement rien"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -41,22 +41,22 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -102,44 +102,46 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -294,62 +296,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Ce profil est prévu pour le SONY PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Ce profil est prévu pour le SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Ce profil est prévu pour le lecteur Microsoft."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Ce profil est prévu pour les livres Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Ce profil est prévu pour le Handlin V3 et ses clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Ce profil est prévu pour le Hanlin V5 et ses clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Ce profil est prévu pour le Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Ce profil est prévu pour le Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Ce profil est prévu pour le Kindle d'Amazon."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Ce profil est prévu pour l'Iliad Irex."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Ce profil est prévu pour l'IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Ce profil est prévu pour le lecteur IRex Digital 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ce profil est prévu pour le Nook B&N."
 
@@ -377,15 +379,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Ce profil est prévu pour le lecteur Kobo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Ce profil est prévu pour le SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Ce profil est prévu pour le JetBook de 5 pouces."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -393,7 +395,7 @@ msgstr ""
 "Ce profil est prévu pour les SONY PRS. Les 500/505/700 etc, en mode paysage. "
 "Principalement utile pour les bandes dessinées."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ce profil est prévu pour le Kindle DX d'Amazon."
 
@@ -413,15 +415,19 @@ msgstr "Personnalisation des plugins locaux"
 msgid "Disabled plugins"
 msgstr "Plugins désactivés."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Absence de plugin compatible dans "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "L'initialisation du plugin %s a échoué en laissant une trace:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -433,18 +439,18 @@ msgstr ""
 "    Personnaliser Calibre en chargeant des modules additionnels externes.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Ajouter un plugin en précisant le chemin vers le fichier zip qui le contient."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Suppression d'un plugin personnalisé d'après son nom. Ceci n'a pas d'effet "
 "sur les plugins intégrés."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -452,15 +458,15 @@ msgstr ""
 "Personnaliser le plugin. Spécifier le nom du plugin et la chaîne de "
 "personnalisation séparés par une virgule."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Lister tous les plugins installés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Activer le plugin nommé"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Désactive le plugin nommé"
 
@@ -476,37 +482,36 @@ msgstr ""
 "Liste de répertoires séparés par des virgules utilisée pour envoyer les "
 "ebooks vers l'appareil. Le premier existant sera utilisé."
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Communiquer avec les téléphones S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Communiquer avec iBooks à travers iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Appareil Apple détecté, lancement d'iTunes, veuillez patienter..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Mise à jour de la liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d sur %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "Terminé"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -516,17 +521,17 @@ msgstr ""
 "Les supprimer en utilisant l'application iBooks.\n"
 "Cliquer 'Afficher détails' pour obtenir la liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "paramètres pour les pilotes de périphériques"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Liste de formats triés acceptés par l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -534,6 +539,18 @@ msgstr ""
 "Certaines illustrations de couverture n'ont pu être converties.\n"
 "Cliquer sur 'Afficher Détails' pour une liste."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Informations"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Communiquer avec le lecteur eBook Binatone Readme"
@@ -556,6 +573,10 @@ msgstr "Communiquer avec le lecteur eBook Cybook Gen 3 / Opus"
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook EB600"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -568,6 +589,10 @@ msgstr "Communiquer avec l'Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook ESlick."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Communiquer avec le lecteur d'ebook Sigmatek"
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -582,14 +607,20 @@ msgstr "Interface de l'appareil"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Communiquer avec les lecteurs d'ebook Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Communiquer avec les lecteurs d'ebook Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook Hanvon N520."
@@ -616,7 +647,7 @@ msgstr "Communiquer avec le lecteur d'ebook Iliad IRex."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -636,15 +667,15 @@ msgstr "Communiquer avec le lecteur Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook Kindle DX."
 
@@ -688,7 +719,7 @@ msgstr "Communique avec le lecteur d'ebook Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Communiquer avec tous les lecteurs d'eBook Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -696,7 +727,7 @@ msgstr ""
 "Liste de métadonnées séparées par des virgules, transformées en collection "
 "dans l'appareil. Les possibilités sont les suivantes : "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Non nommé"
@@ -717,25 +748,25 @@ msgstr "Communiquer avec le lecteur Newsmy"
 msgid "Communicate with the iPapyrus reader."
 msgstr "Communiquer avec le lecteur iPapyrus"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Impossible de détecter le disque %s. Essayer de redémarrer"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Impossible de détecter le point de montage %s. Essayez de redémarrer le "
 "poste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Impossible de monter le disque %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Impossible de trouver l'assistant de montage: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -743,39 +774,28 @@ msgstr ""
 "Impossible de détecter le disque dur %s. Votre noyau doit probablement "
 "exporter une version obsolète de SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Impossible de monter la mémoire principale (Code d'erreur: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Le lecteur n'a aucune carte mémoire dans cette fente."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "La fente choisie %s n'est pas supportée."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Espace insuffisant dans la mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Espace insuffisant sur la carte mémoire"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Informations"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Configurer l'appareil"
@@ -786,57 +806,61 @@ msgstr ""
 "Placer les fichiers dans des sous-répertoires si l'appareil le permet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Lire les métadonnées à partir des fichiers dans l'appareil"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Modèle pour contrôler comment  les livres sont sauvegardés"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Personnalisation complémentaire"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Communiquer avec un lecteur d'ebook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Lit les informations de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Lit la liste des livres de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Transfère les livres vers l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Ajoute les livres à liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Supprime les livres de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Supprime les livres de la liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Envoie les métadonnées vers l'appareil..."
 
@@ -1612,15 +1636,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr "Le décodage de la date/heure a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Conversion de l'entrée en HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Démarrage les transformations de l'ebook...."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Création"
 
@@ -1996,84 +2020,88 @@ msgstr "La famille de police monospace à inclure"
 msgid "Comic"
 msgstr "Bande dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Éditeur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producteur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Commentaires"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Séries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Langue"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Horodatage"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publié"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Droits"
 
@@ -2081,7 +2109,7 @@ msgstr "Droits"
 msgid "EDITORIAL REVIEW"
 msgstr "LIGNE EDITORIALE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2208,6 +2236,10 @@ msgstr "Couverture sauvée sur"
 msgid "No cover found"
 msgstr "Aucune couverture trouvée"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Télécharge les métadonnées"
@@ -2248,6 +2280,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Télécharge les métadonnées sociales à partir d'amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2322,7 +2358,7 @@ msgstr ""
 "Chercher une image de couverture du livre identifié par ISBN sur "
 "LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Couverture"
@@ -2653,6 +2689,8 @@ msgstr ""
 "Obtenir des informations à propos d'un PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Auteur"
 
@@ -2921,8 +2959,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Utiliser les chiffres romains pour les numéros de séries"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Trier la liste des étiquettes par popularité"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -3006,23 +3044,443 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr "catégories du navigateur d'étiquettes à ne pas afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "La présentation de l'interface utilisateur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copié"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Copier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Copier dans le Presse-papiers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Choisir les fichiers"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Utiliser seulement la bibliothèque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+"Annotations utilisateur générées à partir de la bibliothèque principale "
+"uniquement"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Aucun livre sélectionné"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+"Aucun livre sélectionné pour la récupération des annotations à partir de"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "Fusionne les annotations utilisateur dans la base de données"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Dernière Page Lue: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Dernière Page Lue: Position %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Position %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Page %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Position %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "Combien de livres vides?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "Combien de livres vides doivent être ajoutés?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Téléchargement des livres vers l'appareil."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "Livres EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "Livres LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "Livres HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "Livres LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "Livres MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Livres Topaz"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Livres Texte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "Livres PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Bande Dessinées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Archives"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Livres supportés"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Fusionne des livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Des doublons ont été trouvés et fusionnés dans les livres existants suivants:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Impossible de lire les métadonnées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Impossible de lire les métadonnées à partir de"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Aucun livre sélectionné"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "Impossible de supprimer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Choisir les formats à supprimer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Choisir les formats à  <b>ne pas</b> supprimer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr "Carte mémoire A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr "Carte mémoire B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Suppression des livres dans l'appareil"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Les livres sélectionnés vont être <b>supprimés définitivement</b> et les "
+"fichiers seront supprimés de votre ordinateur. Etes-vous sûr ?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"Les livres sélectionnés seront <b>effacés de manière permanente</b> de votre "
+"appareil. Etes vous sûr de votre choix?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Impossible de télécharger les métadonnées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "Métadonnées sociales"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "couvertures"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "métadonnées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Télécharge les livres %s sur %d"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Le téléchargement d'une partie des métadonnées a échoué"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Le téléchargement des métadonnées a échoué pour :"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Le téléchargement des métadonnées a échoué:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Erreur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Impossible d'éditer les métadonnées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Impossible de fusionner les livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Au moins deux livres doivent être séléctionnés avant de fusionner"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Tous les formats de livre et les métadonnées des livres selectionnés seront "
+"ajoutés au <b>premier livre sélectionné</b><br><br>Le second et les livres "
+"suivants sélectionnés ne seront ni supprimés ni changés.<br><br>Veuille "
+"confirmer que vous voulez lancer le traitement."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Tous les formats et les métadonnées des livres sélectionnés seront fusionner "
+"dans le <b>premier livre sélectionné</b> .<br><br>Après la fusion le second "
+"et les prochains livres sélectionnés seront <b>supprimés</b>.<br><br>Tous "
+"les formats de livres du premier livre sélectionné sera conservé et les "
+"formats en double dans le second et les prochains livres seront "
+"définitivement <b>supprimés</b> de votre ordinateur.<br><br> Êtes vous "
+"<b>sûr</b> de vouloir lancer le traitement ?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Vous allez fusionner plus de 5 livres. Etes-vous <b>sûr</b> de vouloir "
+"lancer le traitement ?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Impossible de sauvegarder sur le disque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Choisir le répertoire de destination"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Erreur pendant la sauvegarde"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Il y a eu une erreur lors de la sauvegarde."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Impossible de sauvegarder certains livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Cliquer le bouton afficher les détails pour voir lesquels."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Aucun livre sélectionné pour générer le catalogue pour"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Génère le catalogue %s..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Aucun livre trouvé"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"Aucun livre vers le catalogue\n"
+"Vérifier les étiquettes d'exclusion"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Catalogue généré."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Répertoire d'export du catalogue"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Sélectionner la destination pour %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Récupération des News de "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " récupéré."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Conversion impossible"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Démarrer la conversion de %d livre(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Impossible de visualiser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Choisir le format à afficher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Plusieurs livres sélectionnés"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+"Vous essayer d'ouvrir %d livres. Ouvrir trop de livre en même temps peut "
+"provoquer des ralentissements et avoir des effets négatifs sur les temps de "
+"réponses de l'ordinateur. Une fois démarré le processus ne peut pas être "
+"arrêté avant la fin. Voulez-vous continuer ?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Impossible d'ouvrir le dossier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s n'a pas de format disponible."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Recherche dans"
@@ -3044,15 +3502,10 @@ msgid "The specified directory could not be processed."
 msgstr "Le chemin spécifié ne peut pas être traité."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Aucun livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Aucun livre trouvé"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Ajouté"
@@ -3186,17 +3639,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3215,17 +3668,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3251,6 +3704,58 @@ msgstr ""
 "Livres &Multiples dans un dossier, suppose que chaque livre électronique est "
 "un livre différent"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Chemin"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formats"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr "Collections"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr "Cliquer pour ouvrir"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Aucun"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "Options CSV/XML"
@@ -3310,7 +3815,7 @@ msgstr "sortie"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3328,8 +3833,8 @@ msgstr "Options de l'e-book"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Catalogue"
 
@@ -3650,7 +4155,7 @@ msgstr "0,0 pt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
-msgstr "&Présentation"
+msgstr "Présentation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
 msgid "Control the look and feel of the output"
@@ -4050,11 +4555,6 @@ msgstr "Conserver les &proportions de la couverture"
 msgid "RB Output"
 msgstr "Sortie RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Choisir le format à afficher"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -4143,12 +4643,12 @@ msgid "Footer regular expression:"
 msgstr "Expression régulière pour le pied de page:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Expression régulière incorrecte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Expression régulière incorrecte: %s"
 
@@ -4373,11 +4873,19 @@ msgstr ""
 "XPath consulter le <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">Tutoriel XPath</a>."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr "Le navigateur de coverture ne peut ête chargé"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Navigation par couvertures"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4398,239 +4906,270 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr "étoile(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr "Non noté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr "Supprimer toutes les étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr "étiquettes à ajouter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr "étiquettes à supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Pas de détail disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "L'appareil n'est plus connecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Lit les informations de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Lire la liste de livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Obtenir les annotations à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Envoie les métadonnées vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Envoie le livre %d dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Supprimer les livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Télécharger les livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Afficher le livre sur l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Indiquer l'action par défaut pour 'envoyer au lecteur'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "Email vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr " et efface de la bibliothèque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Envoyer vers la mémoire du lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Envoyer vers la carte mémoire A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Envoyer vers la carte mémoire B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr "Mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr "Carte mémoire A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr "Carte mémoire B"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr "Envoyer et effacer de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Envoyer un format spécifique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr "Connecter au dossier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr "Déconnecter du dossier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "Récupérer les annotations (expérimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Erreur pendant la communication avec le lecteur électronique"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr "Sélectionner le dossier à ouvrir comme appareil"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr "Echec"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Erreur pendant la communication avec le lecteur électronique"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Une erreur temporaire s'est déclenchée pendant la communication avec le "
+"lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
+"électronique et redémarrer."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Appareil: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " detecté."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Connecté: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "sélectionné pour l'envoi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Choisir le format à envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Aucun appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Impossible d'envoyer: Aucun appareil connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Aucune carte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Impossible d'envoyer: L'appareil n'a pas de carte mémoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "En pièce jointe, vous trouverez l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "par"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "dans le format %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Envoi d'un email à"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Pas de format convenable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les envoyer par email "
 "?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Impossible d'envoyer par email les livres suivants car aucun format "
 "convenable n'a été trouvé :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "L'envoi par email des livres a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "L'envoi par email des livres suivants a échoué:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Envoyer par email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "News:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Le fichier attaché est"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Envoi des News vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les télécharger dans "
 "l'appareil ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Envoie les catalogues vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Envoi les News vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Envoie les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -4639,50 +5178,34 @@ msgstr ""
 "convenable n'a été trouvé. Convertissez avant le(s) livre(s) vers un format "
 "supporté par votre appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Le lecteur électronique n'a plus d'espace mémoire disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Impossible d'envoyer les livres sur le lecteur : il n'y a plus assez "
 "d'espace mémoire disponible "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 "Sélectionner les formats disponibles et leurs ordres pour cet appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Utiliser les sous-répertoires"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "Sauvegarder le &modèle:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Chemin"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formats"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "&Couverture à afficher"
@@ -4836,11 +5359,19 @@ msgstr ""
 msgid "new email address"
 msgstr "Nouvelle adresse email"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr "Large"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr "Etroit"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr "Port système sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -4851,143 +5382,135 @@ msgstr ""
 "empêcher le serveur de fonctionner sur ce port. Par sécurité choisissez "
 "plutôt un numéro de port supérieur à 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Erreur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "L'installation des outils en ligne de commande a échouée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "Outils en ligne de commande installés."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "Outils en ligne de commande installés dans"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Si vous déplacez calibre.app, vous devez réinstaller les outils en ligne de "
 "commande."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "N'est pas un chemin correct pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s n'est pas un répertoire correct pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Choisir le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Le plugin ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Le plugin %s ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Le plugin ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Le plugin %s ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Impossible de supprimer les plugins natifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " ne peut pas être retiré. C'est un plugin natif. Essayer plutôt de le "
 "désactiver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr "Vous devez sélectionner une colonne pour pouvoir la supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr "La colonne sélectionnée n'est pas une colonne personnalisée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Etes vous sur ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 "Voulez vous vraiment supprimer la colonne %s et toutes les données qu'elle "
 "contient?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Journal d'erreur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Journal des accès:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "A échoué lors du démarrage du serveur de contenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Sélectionner l'emplacement pour les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Taille incorrecte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "La taille %s est incorrecte. Doit être au format largeurxhauteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Le chemin de la base de données n'est pas correct"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Le chemin de la base de données n'est pas correct "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Doit être un répertoire."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 "Le chemin de la base de données n'est pas correct.<br>Erreur en écriture "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr "Redémarrage nécessaire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4995,19 +5518,19 @@ msgstr ""
 "Les modifications effectuées nécessitent un redémarrage de Calibre. Veuillez "
 "redémarrer dès que possible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Vérifier l'intégrité de la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "La vérification de l'intégrité de la base de données a échouée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "Des incohérences ont été trouvées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5143,13 +5666,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Envoi vers l'&appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Préférences"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5157,31 +5681,31 @@ msgstr ""
 "&Localisation des ebooks (Les ebooks sont stockés dans les dossiers triés "
 "par auteur et les métadonnées sont stockées dans le fichier metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Choisir un nouvel emplacement pour la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Envoyer une notification quand une &nouvelle version est disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "Télécharger les métadonnées &sociales (étiquettes/classement/etc...) par "
 "défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "Écraser l'auteur et le titre par défaut l&ors de la récupération des "
 "métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "&Timeout par défaut pour les connexions réseau :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5189,142 +5713,150 @@ msgstr ""
 "Indiquer le timeout  par défaut pour les recherches réseau (c-à-d le temps "
 "utilisé pour aller rechercher l'information par internet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " secondes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Choisir la &langue (nécessite un redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Haute"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Basse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Priorité du travail:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Format de &sortie préféré:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Ordre préféré pour le format d'&entrée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Utiliser les chiffres &romains pour les numéros de séries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "&Activer l'affichage dans la zone de notification (redémarrage nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Afficher les alertes dans la zone de &notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr "Afficher l'&écran d'accueil au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Afficher la &navigation par couverture dans une fenêtre séparée (redémarrage "
 "nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Rechercher lors de la saisie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Envoyer automatiquement les i&nformations vers le lecteur d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Supprimer les News de la bibliothèque lorsque l'envoi est automatique vers "
 "l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Nombre de couvertures à afficher dans le mode navigation (nécessite un "
 "redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Moyen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Petit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "Taille des &boutons dans la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Afficher le &texte pour les boutons de la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Sélectionner les &colonnes visibles dans la vue bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr "Supprimer une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr "Ajouter une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr "Editer les paramètres d'une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Utiliser l'&afficheur interne pour:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr "Présentation de &l'interface utilisateur (nécessite un redémarrage):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Ajouter une adresse email où les livres seront envoyés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "&Ajouter un email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Par &défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "&Supprimer un email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5334,35 +5866,35 @@ msgstr ""
 "emails seront automatiquement envoyés lors du téléchargement des News à "
 "toutes les adresses qui ont 'Envoyer automatiquement' coché."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "Nombre &maximum de processus de travail en attente (nécessite un "
 "redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "Vérifier l'&intégrité de la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "&Installer les outils en ligne de commande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "Ouvrir le répertoire de &configuration de Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Limiter le nombre max de travaux simultanés au nombre de &cœurs de "
 "processeurs disponibles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "Déboguer la &détection de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -5373,25 +5905,25 @@ msgstr ""
 "endroit dans le monde. Toute modification des paramètres ne prendra effet "
 "qu'après un redémarrage du serveur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Port du serveur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nom d'&utilisateur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Mot de &passe :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5399,7 +5931,7 @@ msgstr ""
 "Si vous laisser le mot de passe à vide, tout le monde pourra accéder à votre "
 "collection de livres en utilisant une interface web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5407,45 +5939,45 @@ msgstr ""
 "Taille maximale (largeurxhauteur) pour l'affichage des couvertures. Les "
 "couvertures plus larges sont redimensionnées. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Taille max. de la &couverture:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Montrer le mot de passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "Nombre d'articles &OPDS max. par requête:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Nombre max. d'articles OPDS &non groupés:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "Démarrer le &Serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "Arrêter le S&erveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Tester le serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "Lancer &automatiquement le serveur au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Afficher les logs du &serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5462,7 +5994,7 @@ msgstr ""
 "Stanza de votre iPhone. Ici nomhote doit être le nom d'hôte complet ou "
 "l'adresse IP de l'ordinateur sur lequel Calibre est démarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5470,27 +6002,27 @@ msgstr ""
 "Ici vous pouvez personnaliser le comportement de Calibre en choisissant les "
 "plugins que vous souhaitez utiliser."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Activer/&Désactiver le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Personnaliser le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "Supp&rimer le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Ajouter un nouveau plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Fichier plugin:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Ajouter"
 
@@ -5527,10 +6059,11 @@ msgid "Number"
 msgstr "Nombre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Date"
 
@@ -5546,75 +6079,76 @@ msgstr "Texte explicatif ajouté dans create_ct_column.py"
 msgid "Create and edit tag-based columns"
 msgstr "Créer et éditer les colonnes basées sur les étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr "Texte, colonne affichée dans le navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 "Texte séparé par des virgules, comme les étiquettes, affiché dans le "
 "navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 "Texte long, comme les commentaires, non affiché dans le navigateur "
 "d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr "Nombres à virgule flottante"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr "Entiers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Notation, affichée à l'aide d'étoiles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr "Oui/Non"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr "Aucune colonne sélectionnée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr "Aucune colonne n'a été sélectionnée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 "La colonne sélectionnée n'est pas une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "Aucun nom n'a été fourni pour la recherche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
-"Le libellé ne doit contenir que des lettres et des chiffres, et commencer "
-"par une lettre"
+"Le libellé doit seulement contenir des lettres, des chiffres et des "
+"underscores, et commencer par une lettre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr "Aucun en-tête de colonne n'a été fourni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr "Le nom recherché %s est déjà utilisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr "L'en-tête %s est déjà utilisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5741,6 +6275,27 @@ msgstr "&Afficher cet avertissement de nouveau"
 msgid "ERROR"
 msgstr "ERREUR"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Triage Auteur"
@@ -5973,11 +6528,6 @@ msgstr "N'est pas une image correcte"
 msgid "Choose formats for "
 msgstr "Choisir les formats pour "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Livres"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Aucune permission"
@@ -6016,71 +6566,81 @@ msgstr "La couverture au format %s est incompatible"
 msgid "Abort the editing of all remaining books"
 msgstr "Abandonner l'édition des livres restants"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Le numéro ISBN est correct"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Le numéro ISBN est incorrect"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr "Editeur d'étiquettes indisponible"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+"L'éditeur d'étiquettes ne peut pas être utilisé si vous avez modifié les "
+"étiquettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Télécharge la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Erreur à la récupération de l'image de couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Erreur à la récupération de l'image de couverture.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Timeout lors du téléchargement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "Impossible de trouver la couverture de ce livre. Essayez déjà de spécifier "
 "le numéro ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Mauvaise couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "La couverture n'est pas une image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Il y a eu des erreurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 "Il y a eu des erreurs lors du téléchargement des métadonnées sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Impossible de récupérer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "Vous devez spécifier au moins un ISBN, un titre, des auteurs ou un éditeur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 "Impossible d'ouvrir %s. Est-il en cours d'utilisation par un autre programme "
@@ -6464,12 +7024,12 @@ msgid "Choose formats"
 msgstr "Choisir les formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Auteurs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Editeurs"
 
@@ -6594,12 +7154,12 @@ msgstr ""
 "Ajoute l'étiquette à la liste des étiquettes et l'applique au livre en cours"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr "L'article est vide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 "Un article ne peut être défini à une valeur nulle. Supprimez le à la place."
@@ -6633,15 +7193,15 @@ msgstr "Vous devez sélectionner au moins un article de la liste."
 msgid "Are you certain you want to delete the following items?"
 msgstr "Etes vous sûr de vouloir supprimer les articles suivants?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr "Éditeur de catégories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr "Articles en cours d'utlisation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
@@ -6649,11 +7209,11 @@ msgstr ""
 "Supprimer l'article de la base de données. Ceci desactivera l'article pour "
 "tous les livres et le supprimera ensuite de la base de données."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr "Renommer l'article"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr "Ctrl+S"
 
@@ -6932,11 +7492,11 @@ msgstr "Expression régulière (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Pas de correspondance"
 
@@ -6972,55 +7532,210 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expression régulière (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Sauvegarder un seul format vers le disque..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Editer les métadonnées individuellement"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Editer les métadonnées par lot"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Télécharger les métadonnées et les couvertures"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Télécharger seulement les métadonnées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Télécharger seulement les couvertures"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Télécharger uniquement les métadonnées sociales"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Fusionner dans le premier livre sélectionné - supprimer les autres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Fusionner dans le premier livre sélectionné - conserver les autres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Ajouter des livres à partir d'un répertoire"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Ajouter des livres par répertoires et sous-répertoires. (Un livre par "
+"répertoire, chaque fichier représente le même livre dans un format différent)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Ajouter des livres par répertoires et sous-répertoires. (Plusieurs livres "
+"par répertoire, chaque fichier est un livre différent)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Ajouter un livre vide. (Une entrée sans aucun format)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Sauvegarder sur le disque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Sauvegarder sur le disque dans un seul répertoire"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Sauvegarder seulement le format %s vers le disque"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+"Sauvegarder seulement le format %s sur le disque dans un repertoire unique"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Visualiser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Visualiser le format spécifique"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Supprimer les livres sélectionnés"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+"Supprimer les fichiers d'un format spécifique pour les livres sélectionnés..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Supprimer tous les formats pour les livres sélectionnés, excepté..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Supprimer les couvertures des livres sélectionnés"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Convertir individuellement"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Convertir par lot"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Créer le catalogue des livres dans votre bibliothèque Calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Démarrer l'assistant de bienvenue"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Livres similaires..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr "Navigateur de couvertures"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr "Navigateur d'étiquettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr "Détails du livre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Travaux"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Statut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Temps d'exécution"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Il y %d travaux en cours:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Travail inconnu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Il y %d travaux en attente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Impossible d'arrêter le travail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 "Impossible de tuer les travaux lorsqu'ils communiquent avec l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Le travail a déjà démarré"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Indisponible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Travaux :"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Cliquer pour voir la liste des travaux actifs."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Travaux"
 
@@ -7030,114 +7745,92 @@ msgstr "N"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "Y"
-msgstr "O"
+msgstr "Y"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr "Dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Taille (Mo)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Note"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Aucun"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Livre <font face=\"serif\">%s</font> of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr "Le nom recherché/consulté est \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "Dans la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr "Taille"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr "Collections"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr "Marqué pour suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Double clic pour m' <b>éditer</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr "Cacher la colonne %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr "Trier par %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr "Descendant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr "Changer l'alignement du texte pour %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr "Gauche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr "Droite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr "Centre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr "Afficher la colonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr "Restorer l'affichage par défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Interdit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7235,59 +7928,59 @@ msgstr "Loggue les informations de débogage dans la console"
 msgid "Do not check for updates"
 msgstr "Ne pas vérifier les mises à jour"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
+msgid "Calibre Library"
+msgstr "Bibliothèque Calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
 msgid "Choose a location for your calibre e-book library"
 msgstr "Choisissez un emplacement pour votre bibliothèque d'e-books Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
 msgid "Failed to create library"
 msgstr "La création de la bibliothèque a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-"La création de la bibliothèque a échoué au %r. Interruption de la tache."
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr "Echec de la création de la bibliothèque à: %r."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
+msgid "Choose a location for your new calibre e-book library"
+msgstr ""
+"Choisissez un emplacement pour votre nouvelle bibliothèque d'e-books Calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
 msgid "Initializing user interface..."
 msgstr "Initialisation de l'interface utilisateur..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
 msgid "Repairing failed"
 msgstr "La réparation a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
 "La réparation de la base de données a échoué. Lancement avec une nouvelle "
 "bibliothèque vide."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
-msgid "Calibre Library"
-msgstr "Bibliothèque Calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
-msgid "Choose a location for your new calibre e-book library"
-msgstr ""
-"Choisissez un emplacement pour votre nouvelle bibliothèque d'e-books Calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Mauvais emplacement pour la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 "Mauvais emplacement %r pour la base de données. Calibre va maintenant se "
 "fermer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "Base de données corrompue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
@@ -7297,90 +7990,90 @@ msgstr ""
 "essaie de la réparer automatiquement? En cas de refus, une nouvelle "
 "bibliothèque sera crée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 "Réparation de la base de données. Ceci peut prendre un certain temps pour "
 "une collection importante."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 "Mauvais emplacement %r pour la base de données. Calibre va démarrer avec une "
 "nouvelle bibliothèque vide."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr "Démarrage de %s en cours: Chargement des livres..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Si vous êtes sûr qu'il n'est pas démarré"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Impossible de lancer "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s est déjà démarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "peut être démarré dans la zone de notification, dans la"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "région en haut et à droite de l'écran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "région en bas et à droite de l'écran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "Essayer de redémarrer l'ordinateur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "Essayer de supprimer le fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr "&Limiter à:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 "Les livres affichés seront limités à ceux correspondant à la recherche "
 "sauvegardée sélectionnée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "indiquer dans ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Recherche :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -7389,149 +8082,119 @@ msgstr ""
 "commentaires, etc...<br><br>Les mots séparés par des espaces sont traités "
 "avec des AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Réinitialisation de la recherche rapide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 "Choisir la recherche sauvegardée ou entrer un nom pour une nouvelle "
 "recherche à sauvegarder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 "Copier le texte de recherche courant (au lieu du nom de la recherche)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Sauvegarder la recherche courante avec le nom indiqué dans la boite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Supprimer la recherche sauvegardée actuelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Trier par &popularité"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Aucune correspondance"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Toutes les correspondances"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr "Créer, éditer, et effacer les catégories définies par l'utilisateur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr "Gérer les catégories de l'&utilisateur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Ajouter des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Supprimer des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Editer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr "Fusionner les enregistrements de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Sauvegarder sur le disque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Récupérer des News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Convertir des ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Visualiser"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Ouvrir le dossier contenant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Afficher les détails du livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Livres du même auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Livres dans cette série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Livres de cet éditeur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Livres avec les mêmes étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Configurer Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7564,17 +8227,38 @@ msgstr "Le livre n'a ni titre ni ISBN"
 msgid "No matches found for this book"
 msgstr "Aucune correspondance pour ce livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Trouver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "La recherche sélectionnée sera  <b>définitivement effacée</b>. Êtes-vous sûr "
 "de vouloir continuer?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+"Recherche (pour une recherche avancée cliquer sur le bouton à gauche)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Recherches sauvegardées"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr "({0} de {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(tous les livres)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr "({0} de tout)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Appuyer sur une touche..."
@@ -7635,83 +8319,76 @@ msgstr "Effacer"
 msgid "&Alternate shortcut:"
 msgstr "Raccourci &alternatif:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Travaux :"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Cliquer pour voir la liste des travaux actifs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr "Cacher les détails du Livre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr "Afficher les détails du Livre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr "Cacher le navigateur d'Etiquettes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr "Afficher le navigateur d'Etiquettes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr "Cacher le navigateur de Couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr "Afficher le navigateur de Couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr "Volet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr "Le navigateur de couverture ne peut pas être chargé: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr "Renommer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr "Cacher la catégorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr "Afficher la catégorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr "Afficher toutes les catégories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
-msgstr "Gérer "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr "Gérer les Recherches Sauvegardées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr "Gérer les Catégories définies par l'Utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Recherches"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
-msgstr "Le nom %s est déjà utilisé."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Nom de recherche en double"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "Le nom de la recherche sauvegardé %s est déjà utilisé"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Toutes les correspondances"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Aucune correspondance"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "Gérer les catégories de l'&utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -7756,620 +8433,63 @@ msgstr ""
 "Les fichiers suivants ont déjà été convertis au format %s. Souhaitez-vous "
 "les reconvertir ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Sauvegarder un seul format vers le disque..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-"Recherche (pour une recherche avancée cliquer sur le bouton à gauche)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Recherches sauvegardées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Erreur pendant la communication avec le lecteur électronique"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Montrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "&Donner pour supporter Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "&Ejecter l'appareil connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Redémarrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Pour l'aide, consulter le <a href=\"%s\">Manuel Utilisateur</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s par <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Editer les métadonnées individuellement"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Editer les métadonnées par lot"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Télécharger les métadonnées et les couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Télécharger seulement les métadonnées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Télécharger seulement les couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Télécharger uniquement les métadonnées sociales"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Fusionner dans le premier livre sélectionné - supprimer les autres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Fusionner dans le premier livre sélectionné - conserver les autres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Ajouter des livres à partir d'un répertoire"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Ajouter des livres par répertoires et sous-répertoires. (Un livre par "
-"répertoire, chaque fichier représente le même livre dans un format différent)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Ajouter des livres par répertoires et sous-répertoires. (Plusieurs livres "
-"par répertoire, chaque fichier est un livre différent)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Ajouter un livre vide. (Une entrée sans aucun format)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Sauvegarder sur le disque dans un seul répertoire"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Sauvegarder seulement le format %s vers le disque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-"Sauvegarder seulement le format %s sur le disque dans un repertoire unique"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Visualiser le format spécifique"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Supprimer les livres sélectionnés"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-"Supprimer les fichiers d'un format spécifique pour les livres sélectionnés..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Supprimer tous les formats pour les livres sélectionnés, excepté..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Supprimer les couvertures des livres sélectionnés"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Convertir individuellement"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Convertir par lot"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Créer le catalogue des livres dans votre bibliothèque Calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Démarrer l'assistant de bienvenue"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Livres similaires..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Guide De Démarrage Rapide Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr "Sélectionner le dossier à ouvrir comme appareil"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Navigation par couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr "({0} de {1})"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(tous les livres)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr "({0} de tout)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Appareil: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " detecté."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Connecté: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Base de données d'appareils corrompue"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>La base de données sur le lecteur est corrompue. Essayer "
-"ceci:\n"
-"                <ol>\n"
-"                <li>Débrancher le lecteur. Attendre qu'il regénère la base "
-"de données (c-à-d attendre jusqu'à ce qui soit prêt à être utiliser). "
-"Brancher le. Maintenant, cela devrait fonctionner avec %(app)s. Si cela ne "
-"fonctionne pas, essayer l'étape suivante.</li>\n"
-"                <li>Quitter %(app)s. Trouver le ficher media.xml dans la "
-"mémoire principale du lecteur. Supprimer le. Débrancher le lecteur. Attendre "
-"qu'il regénère la base de données. Le reconnecter et démarrer %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Utiliser seulement la bibliothèque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-"Annotations utilisateur générées à partir de la bibliothèque principale "
-"uniquement"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Aucun livre sélectionné"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-"Aucun livre sélectionné pour la récupération des annotations à partir de"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "Fusionne les annotations utilisateur dans la base de données"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Dernière Page Lue: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Dernière Page Lue: Position %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Position %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Page %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Position %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "Combien de livres vides?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "Combien de livres vides doivent être ajoutés?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Téléchargement des livres vers l'appareil."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "Livres EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "Livres LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "Livres HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "Livres LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "Livres MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr "Livres Topaz"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Livres Texte"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "Livres PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Bande Dessinées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Archives"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "Livres supportés"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "Fusionne des livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Des doublons ont été trouvés et fusionnés dans les livres existants suivants:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Impossible de lire les métadonnées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Impossible de lire les métadonnées à partir de"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "Impossible de supprimer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Aucun livre sélectionné"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "Choisir les formats à supprimer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "Choisir les formats à  <b>ne pas</b> supprimer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Les livres sélectionnés vont être <b>supprimés définitivement</b> et les "
-"fichiers seront supprimés de votre ordinateur. Etes-vous sûr ?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-"Les livres sélectionnés seront <b>effacés de manière permanente</b> de votre "
-"appareil. Etes vous sûr de votre choix?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Suppression des livres dans l'appareil"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Impossible de télécharger les métadonnées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "Métadonnées sociales"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "couvertures"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "métadonnées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Télécharge les livres %s sur %d"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Le téléchargement d'une partie des métadonnées a échoué"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Le téléchargement des métadonnées a échoué pour :"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Le téléchargement des métadonnées a échoué:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Impossible d'éditer les métadonnées"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "Impossible de fusionner les livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Au moins deux livres doivent être séléctionnés avant de fusionner"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-"Tous les formats de livre et les métadonnées des livres selectionnés seront "
-"ajoutés au <b>premier livre sélectionné</b><br><br>Le second et les livres "
-"suivants sélectionnés ne seront ni supprimés ni changés.<br><br>Veuille "
-"confirmer que vous voulez lancer le traitement."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-"Tous les formats et les métadonnées des livres sélectionnés seront fusionner "
-"dans le <b>premier livre sélectionné</b> .<br><br>Après la fusion le second "
-"et les prochains livres sélectionnés seront <b>supprimés</b>.<br><br>Tous "
-"les formats de livres du premier livre sélectionné sera conservé et les "
-"formats en double dans le second et les prochains livres seront "
-"définitivement <b>supprimés</b> de votre ordinateur.<br><br> Êtes vous "
-"<b>sûr</b> de vouloir lancer le traitement ?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Vous allez fusionner plus de 5 livres. Etes-vous <b>sûr</b> de vouloir "
-"lancer le traitement ?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Impossible de sauvegarder sur le disque"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Choisir le répertoire de destination"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Erreur pendant la sauvegarde"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Il y a eu une erreur lors de la sauvegarde."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Impossible de sauvegarder certains livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "Cliquer le bouton afficher les détails pour voir lesquels."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "Aucun livre sélectionné pour générer le catalogue pour"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Génère le catalogue %s..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"Aucun livre vers le catalogue\n"
-"Vérifier les étiquettes d'exclusion"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Catalogue généré."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "Répertoire d'export du catalogue"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "Sélectionner la destination pour %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Récupération des News de "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " récupéré."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Conversion impossible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "Démarrer la conversion de %d livre(s)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Impossible de visualiser"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Plusieurs livres sélectionnés"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-"Vous essayer d'ouvrir %d livres. Ouvrir trop de livre en même temps peut "
-"provoquer des ralentissements et avoir des effets négatifs sur les temps de "
-"réponses de l'ordinateur. Une fois démarré le processus ne peut pas être "
-"arrêté avant la fin. Voulez-vous continuer ?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Impossible d'ouvrir le dossier"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s n'a pas de format disponible."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossible de configurer pendant que des travaux sont en cours."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr "Configuration impossible avant que Calibre n'ait été redémarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Pas d'information détaillée disponible pour les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr "Echec"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Erreur pendant la communication avec le lecteur électronique"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Une erreur temporaire s'est déclenchée pendant la communication avec le "
-"lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
-"électronique et redémarrer."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8378,15 +8498,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. Vous devez d'abord enlever les DRM avec des outils "
 "tiers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Recette désactivée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -8395,11 +8515,11 @@ msgstr ""
 "Si vous le trouvez utile, pensez à donner afin de supporter son "
 "développement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Il y a des travaux actifs. Voulez-vous vraiment finir ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8410,11 +8530,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8422,7 +8542,7 @@ msgstr ""
 "continuera à tourner dans la zone de notification. Pour le fermer, choisir "
 "<b>Quitter</b> dans le menu contextuel de la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8430,11 +8550,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Dernière version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Mise à jour disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8920,15 +9040,15 @@ msgstr "Maj+F3"
 msgid "Print eBook"
 msgstr "Imprimer un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Coller l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8938,7 +9058,7 @@ msgstr ""
 "%d\n"
 "Livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8948,7 +9068,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8958,7 +9078,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8968,49 +9088,61 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Cliquer pour voir les livres disponibles sur votre ordinateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 "Cliquer pour voir les livres dans la mémoire principale de votre lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 "Cliquer pour voir les livres dans la carte mémoire A de votre lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 "Cliquer pour voir les livres dans la carte mémoire B de votre lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr "Livres situés à"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Modifier la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Majuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Minuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Basculer la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Casse du titre"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr "Faire glisser pour redimensionner"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr "Afficher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr "Masquer"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9319,48 +9451,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Démarrer le serveur de &contenu"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr "Aujourd'hui"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr "Hier"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr "Ce mois-ci"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr "il y a quelques jours"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr "Non"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr "Non vérifié"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr "Vérifié"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr "Oui"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr "vierge"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr "Vide"
 
@@ -9892,7 +10024,7 @@ msgstr ""
 "Par défaut: Pas de filtre"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Affiche des informations détaillées. Utile pour le débogage"
 
@@ -9959,7 +10091,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
-msgstr "o"
+msgstr "y"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:756
 msgid ""
@@ -10007,43 +10139,47 @@ msgstr ""
 "\n"
 "Pour une aide sur commande précise: %%prog commande --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr "Principal"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr "Carte A"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr "Carte B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migre l'ancienne base vers la bibliothèque dans %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Copie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Compacte la base"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "Vérifie l'intégrité SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "Vérifie si des fichiers sont manquants."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "Id vérifié"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Notes"
 
@@ -10272,43 +10408,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr "Ecrire le PID du processus dans le fichier spécifié"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr "%d livres"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr "%d articles"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "NOTE: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr "ETIQUETTES: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "SERIES: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Livres dans votre bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr "Par "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr "Livres classés par "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr "Le plus récent"
 
@@ -10455,34 +10591,38 @@ msgid "English (Pakistan)"
 msgstr "Anglais (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Anglais (Singapour)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "Anglais (Yemen)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "Anglais (Irlande)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Anglais (Chine)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Espagnol (Paraguay)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Allemand (AT)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Néerlandais (NL)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Flamand (BE)"
 
@@ -10545,95 +10685,95 @@ msgstr ""
 "Ne pas télécharger la dernière version des recettes intégrées à partir du "
 "server Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Source de News inconnue"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 "La recette \"%s\" a besoin d'un nom d'utilisateur et d'un mot de passe."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Téléchargement effectué"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Impossible de télécharger les articles suivants;"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 "Impossible de télécharger certaines parties pour les articles suivants:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tLiens qui ont échoués:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Impossible de récupérer l'article. Le lancer avec -w pour en connaitre la "
 "raison"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Récupération des flux..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Obtient les flux à partir de la page d'index"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Essaie de télécharger la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "Génération du masthead"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Commence le téléchargement [processus %d]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Flux téléchargés de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Impossible de télécharger la couverture: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Télécharge la couverture de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "L'image du titre a été téléchargée"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Article sans titre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Article téléchargé : %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Impossible de télécharger l'article: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Récupération du flux"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10641,7 +10781,7 @@ msgstr ""
 "La connexion a échouée, vérifier votre nom d'utilisateur et votre mot de "
 "passe pour le service Périodique Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10664,7 +10804,7 @@ msgstr "Planifié"
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10674,12 +10814,12 @@ msgstr ""
 "\n"
 "Où URL est par exemple http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Répertoire de base dans lequel l'URL est sauvegardée. Par défaut: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10687,7 +10827,7 @@ msgstr ""
 "Timeout en secondes d'attente pour la réponse du serveur. Par défaut: "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10695,7 +10835,7 @@ msgstr ""
 "Nombre maximum de niveaux de récursivité c-à-d le niveau de profondeur de "
 "liens à suivre. Par défaut : %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10703,7 +10843,7 @@ msgstr ""
 "Nombre maximum de fichiers à télécharger. Ceci ne sera valable que pour pour "
 "les fichiers à partir des balises <a href>.Par défaut: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10711,7 +10851,7 @@ msgstr ""
 "Intervalle minimal entre deux téléchargements, en secondes. %default s par "
 "défaut."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10719,7 +10859,7 @@ msgstr ""
 "Encodage des caractères pour les sites web que vous essayer de télécharger. "
 "Par défaut, essaie et trouve l'encodage."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -10730,7 +10870,7 @@ msgstr ""
 "correspondra à quelque expression que ce soit, sera suivi. Par défaut, tous "
 "les liens sont suivis."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10745,7 +10885,7 @@ msgstr ""
 "regexp sont spécifiés ensemble, alors --filter-regexp sera appliqué en "
 "premier."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Ne pas télécharger les feuilles de style CSS."
 
@@ -11615,6 +11755,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "Les liens sont ajoutés à la table des matières uniquement lorsque le nombre "
 #~ "de chapitres détectés est inférieur au paramètre --toc-threshold."
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Base de données d'appareils corrompue"
+
 #~ msgid "Set defaults for conversion of comics"
 #~ msgstr ""
 #~ "Indiquer les valeurs par défaut pour la conversion des bandes dessinées"
@@ -11637,6 +11780,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Output:"
 #~ msgstr "Sortie:"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Trier par &popularité"
+
 #~ msgid "Do not force text to be justified in output."
 #~ msgstr "Ne pas forcer  la justification du texte en sortie."
 
@@ -11950,6 +12096,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "The output directory. Defaults to the current directory."
 #~ msgstr "Répertoire de sorite. Par défaut : le répertoire courant."
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Trier la liste des étiquettes par popularité"
+
 #~ msgid "Bulk convert to "
 #~ msgstr "Convertir par lot vers "
 
@@ -12167,6 +12316,34 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Must set account information"
 #~ msgstr "Vous devez spécifiez des informations sur le compte"
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>La base de données sur le lecteur est corrompue. Essayer "
+#~ "ceci:\n"
+#~ "                <ol>\n"
+#~ "                <li>Débrancher le lecteur. Attendre qu'il regénère la base "
+#~ "de données (c-à-d attendre jusqu'à ce qui soit prêt à être utiliser). "
+#~ "Brancher le. Maintenant, cela devrait fonctionner avec %(app)s. Si cela ne "
+#~ "fonctionne pas, essayer l'étape suivante.</li>\n"
+#~ "                <li>Quitter %(app)s. Trouver le ficher media.xml dans la "
+#~ "mémoire principale du lecteur. Supprimer le. Débrancher le lecteur. Attendre "
+#~ "qu'il regénère la base de données. Le reconnecter et démarrer %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid "Options to control the fetching of periodical content from the web."
 #~ msgstr ""
 #~ "Options pour contrôler la récupération périodique de contenu à partir du web."
@@ -13048,3 +13225,49 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 
 #~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
 #~ msgstr "Communiquer avec le lecteur d'ebook Sony PRS-300/505/500."
+
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr ""
+#~ "La création de la bibliothèque a échoué au %r. Interruption de la tache."
+
+#~ msgid ""
+#~ "The label must contain only letters and digits, and start with a letter"
+#~ msgstr ""
+#~ "Le libellé ne doit contenir que des lettres et des chiffres, et commencer "
+#~ "par une lettre"
+
+#~ msgid "Create, edit, and delete user categories"
+#~ msgstr "Créer, éditer, et effacer les catégories définies par l'utilisateur"
+
+#~ msgid "Hide Book Details"
+#~ msgstr "Cacher les détails du Livre"
+
+#~ msgid "Show Book Details"
+#~ msgstr "Afficher les détails du Livre"
+
+#~ msgid "Hide Tag Browser"
+#~ msgstr "Cacher le navigateur d'Etiquettes"
+
+#~ msgid "Show Tag Browser"
+#~ msgstr "Afficher le navigateur d'Etiquettes"
+
+#~ msgid "Hide Cover Browser"
+#~ msgstr "Cacher le navigateur de Couvertures"
+
+#~ msgid "Show Cover Browser"
+#~ msgstr "Afficher le navigateur de Couvertures"
+
+#~ msgid "Cover browser could not be loaded: "
+#~ msgstr "Le navigateur de couverture ne peut pas être chargé: "
+
+#~ msgid "Manage "
+#~ msgstr "Gérer "
+
+#~ msgid "Rename"
+#~ msgstr "Renommer"
+
+#~ msgid "The name %s is already used."
+#~ msgstr "Le nom %s est déjà utilisé."
+
+#~ msgid "Side bar"
+#~ msgstr "Volet"
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 629ddb0fae..b2ed13c62b 100644
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:45+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:25+0000\n"
 "Last-Translator: Imendez <ivan.mendez.lopez@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Non facer nada"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -293,62 +295,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Este perfil é o propio para o SONY PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Este perfil é o propio para o SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Este perfil é o propio para o Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Este perfil é o propio para os libros Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Este perfil é o propio para o Hanlin V3 e os seus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Este perfil é o propio para o Hanlin V5 e os seus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Este perfil é o propio para o Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Este perfil é o propio para o Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Este perfil é o propio para o Kindle de Amazon."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Este perfil é o propio para o rex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Este peril é o propio para o IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Este perfil é o propio para o  IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfil é o propio para o B&N Nook."
 
@@ -376,15 +378,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Este perfil está sangrado para o Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Este perfil é o propio para o SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Este perfil é o propio para o JetBook de cinco polgadas."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -392,7 +394,7 @@ msgstr ""
 "Este perfl é o propio para os da liña SONY PRS. Os 00/505/700 etc en modo "
 "apaisado. Usados sobre todo para cómics."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é o propio o Amazon Kindle DX."
 
@@ -412,15 +414,19 @@ msgstr "Personalización de engadido local"
 msgid "Disabled plugins"
 msgstr "Engadidos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Non se acharon engadidos correctos en "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Fallou o inicio do engadido %s deixando a seguinte traza:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -432,18 +438,18 @@ msgstr ""
 "    Personalice Calibre cargando engadidos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Engadir un engadido especificando o camiño ao ficheiro zip que o contén."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Eiminar un engadido persoal polo nome. Non afecta aos engadidos incorporados "
 "no programa."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -451,15 +457,15 @@ msgstr ""
 "Personalizar engadido. Especifica o nome do engadido e o texto de "
 "personalización separados por unha coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Listar todos os complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Activar o complemento sinalado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Desactivar o complemento sinalado"
 
@@ -475,55 +481,54 @@ msgstr ""
 "Lista de cartafoles, separados por comas, onde almacenar os libros no "
 "dispositivo. Usarase o primeiro que exista"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Comunicar con iBooks a través do iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Detectouse un dispositivo de Apple. Estase a iniciar o iTunes, agarde..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Actualizando a relación de metadatos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "ramtouse"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr "Algúns libros non se acharon na base de datos do iTunes-"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "Configuración para os controladores de dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Lista ordenada de formatos que o dispositivo aceptará"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -531,6 +536,18 @@ msgstr ""
 "Algunhas portadas non se converteron. \n"
 "Prema \"Amosar detalles\" para relacionalas."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Noticias"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Comunicar co lector de libros electrónicos Binatone Readme."
@@ -553,6 +570,10 @@ msgstr "Comunicarse co lector de libros electrónico Cybook Gen 3 / Opus."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Comunicar co lector EB600"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -565,6 +586,10 @@ msgstr "Comunicar co Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Comunicar co lector ESlick"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -579,14 +604,20 @@ msgstr "Interface do Dispositivo"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Comunicar cos lectores Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Comunicar cos lectores Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunicar co lector BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Comunicar co lector de libro electrónico Hanvon N520."
@@ -613,7 +644,7 @@ msgstr "Comunicar co lector IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "Nome Apelidos"
 
@@ -633,15 +664,15 @@ msgstr "Comunicar co lector Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Comunicar co lector JetBook"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Comunicar co lector Kindle"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Comunicar co lector Kindle 2"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Comunicarse co lector Kindle DX"
 
@@ -685,7 +716,7 @@ msgstr "Comunicar co lector Sony PRS-500"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunicar con todos os lectores de Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -693,7 +724,7 @@ msgstr ""
 "Lista separada por comas de campos de metadatos para convertelos en "
 "coleccións no dispositivo. As posibilidades son: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Sen nome"
@@ -714,23 +745,23 @@ msgstr "Comunicar co lector de Newsmy"
 msgid "Communicate with the iPapyrus reader."
 msgstr "Comunicar co lector de iPapyrus."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Non se puido detectar a unidade de disco %s. Probe a reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "Non é posible detectar o punto de montaxe %s. Tente reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Non se puido detectar a unidade de disco %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Non é posible atopar o asistente para a montaxe: %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -738,39 +769,28 @@ msgstr ""
 "No se puido detectar a unidade de disco %s. Probablemente o núcleo está "
 "exportando una versión anticuada de SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Non é posible montar a memoria principal (código do erro: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "O lector non ten ningunha tarxeta de memoria no slot."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "A bahía %s seleccionada non está soportada."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "O espazo libre na memoria principal é insuficiente"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "O espazo libre na tarxeta de memoria é insuficiente"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Noticias"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Configurar o Dispositivo"
@@ -781,57 +801,61 @@ msgstr ""
 "Colocar os ficheiros dentro de subcartafoles se o dispositivo os soporta"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Ler os metadatos dos ficheiros no dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Modelo para controlar como se gardan os libros"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Personalización adicional"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Comunicar cun lector de eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Obter información do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Obtendo a lista de libros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "A transferir os libros ao dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Engadindo libros á lista de metatados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "A eliminar os libros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros da lista de metatados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "A enviar metadatos ao dispositivo..."
 
@@ -1577,15 +1601,15 @@ msgstr "O índice na serie e a valoración deben ser números. Ignóranse"
 msgid "Failed to parse date/time"
 msgstr "Produciuse un fallo ao procesar data/hora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "A converter a entrada a HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Aplicando transformacións ao libro electrónico..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "A crear"
 
@@ -1944,84 +1968,88 @@ msgstr "Familia de letra monoespazada para incorporar."
 msgid "Comic"
 msgstr "Cómic"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autores/as"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Editor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produtor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Comentarios"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Series"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Marca temporal"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Dereitos"
 
@@ -2029,7 +2057,7 @@ msgstr "Dereitos"
 msgid "EDITORIAL REVIEW"
 msgstr "SUMARIO DA EDITORIAL"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2151,6 +2179,10 @@ msgstr "Capa gardada en"
 msgid "No cover found"
 msgstr "Non se achou capa ningunha"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Descarga de metadatos"
@@ -2191,6 +2223,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Descarga os metadatos de amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2254,7 +2290,7 @@ msgstr ""
 "Obter unha imaxe da capa do libro identificado polo ISBD de "
 "LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Capa"
@@ -2588,6 +2624,8 @@ msgstr ""
 "Obter a información do PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2830,7 +2868,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2907,23 +2945,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Copiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Copiar no Portapapeis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Escoller os Ficheiros"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Usar só a biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Arquivos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Erro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Non é posíbel gardar no disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Non se acharon libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Obtendo novas de "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Escoller o formato de visualización"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "A Buscar"
@@ -2945,15 +3376,10 @@ msgid "The specified directory could not be processed."
 msgstr "Non se puido procesar o directorio especificado."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Sen libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Non se acharon libros"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Engadido"
@@ -3072,17 +3498,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3101,17 +3527,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3133,6 +3559,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Camiño"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Ningún"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -3192,7 +3670,7 @@ msgstr "saída"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3210,8 +3688,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3891,11 +4369,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "Saída RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Escoller o formato de visualización"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3978,12 +4451,12 @@ msgid "Footer regular expression:"
 msgstr "Expresión regular do pé de páxina:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Expresión regular non válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Expresión regular non válida: %s"
 
@@ -4191,11 +4664,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4216,278 +4697,290 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Camiño"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formatos"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4632,165 +5125,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Erro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "O camiño do engadido non é correcto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s non é correcto como camiño do engadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4901,279 +5394,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Alto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Baixo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "&Quitar correo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5184,33 +5686,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Quitar engadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -5247,10 +5749,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
 
@@ -5266,68 +5769,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5436,6 +5940,27 @@ msgstr ""
 msgid "ERROR"
 msgstr "ERRO"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Formato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5642,11 +6167,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr "Escolla os formatos para "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Permiso denegado"
@@ -5685,67 +6205,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Non é posíbel oter metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -6102,12 +6630,12 @@ msgid "Choose formats"
 msgstr "Escoller formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autores"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr ""
 
@@ -6220,12 +6748,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6257,25 +6785,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6517,11 +7045,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6557,54 +7085,203 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Gardar no disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Gardar no disco nun único cartafol"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Ver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Quitar os libros seleccionados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Traballo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Estado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progreso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Tempo en execución"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Traballos:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Prema para ver a lista dos traballos activos."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Traballos"
 
@@ -6616,112 +7293,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Puntuación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Ningún"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Formato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Non permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6817,282 +7472,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Biblioteca do Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Engadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Quitar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Supr"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Editar metainformación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Gardar no disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Obter novas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Converter libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Ver"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -7122,15 +7748,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -7191,82 +7837,75 @@ msgstr "Limpar"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Traballos:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Prema para ver a lista dos traballos activos."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7308,619 +7947,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Gardar no disco nun único cartafol"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Quitar os libros seleccionados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Usar só a biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Arquivos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Non é posíbel gardar no disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Obtendo novas de "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Non se pode configurar mentres haxa traballos en execución."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hai traballos en activo. Está seguro de querer saír?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "Aviso: traballos en activo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8387,15 +8519,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8405,67 +8537,79 @@ msgstr ""
 "%d\n"
 "libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8726,48 +8870,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Prender o servidor de &contidos"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -9145,7 +9289,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -9226,43 +9370,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "A copiar <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "A compactar a base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "A comprobar a integridade SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "A comprobar os ficheiros perdidos."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "id comprobada"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9448,43 +9596,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9627,34 +9775,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+msgid "Spanish (Paraguay)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Alemán (Austria)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Flamenco (Holanda)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Flamenco (Bélxica)"
 
@@ -9711,97 +9863,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Fonte de Novas Descoñecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Rematou a descarga"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Produciuse un fallo na descarga dos seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Produciuse un fallo na descarga de partes do seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " desde "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tLigazóns erradas:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "A obter os fluxos..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Tratando de descargar a capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "A comezar a descarga [%d fío(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Fluxos descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Non se puido descargar a capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "A descargar a capa desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Artigo sen Título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Artigo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Erro ao descargar o artigo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "A obter o fluxo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9822,55 +9974,55 @@ msgstr "Programado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9879,7 +10031,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Non descargar follas de estilo CSS"
 
diff --git a/src/calibre/translations/he.po b/src/calibre/translations/he.po
index daeb7bd829..9487b1627d 100644
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:33+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 16:52+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "לא עושה דבר"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -284,62 +286,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "פרופיל זה מיועד עבור SONY PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "פרופיל זה מיועד עבור SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "פרופיל זה מיועד עבור Microsoft Reader"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "פרופיל זה מיועד עבור Mobipocket books."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "פרופיל זה מיועד עבור Hanlin V3 ומכשירים דומים."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "פרופיל זה מיועד עבור Hanlin V5 ומכשירים דומים"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "פרופיל זה מיועד עבור Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "פרופיל זה מיועד עבור Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "פרופיל זה מיועד עבור Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "פרופיל זה מיועד עבור Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "פרופיל זה מיועד עבור IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "פרופיל זה מיועד עבור IRex Digital Reader 800"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "פרופיל זה מיועד עבור B&N Nook."
 
@@ -365,15 +367,15 @@ msgstr "מיועד ל-iPad ומכשירים דומים עם רזולוציה ש
 msgid "This profile is intended for the Kobo Reader."
 msgstr "פרופיל זה מיועד ל-Kobo Reader"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "פרופיל זה מיועד למכשיר SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "פרופיל זה מיועד למכשיר 5-inch JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -381,7 +383,7 @@ msgstr ""
 "פרופיל זה מיועד למכשיר מקו SONY PRS. ה- 500/505/700 וכדומה בתצוגה "
 "אופקית.שימושי במיוחד עבור קומיקס."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "פרופיל זה מיועד למכשיר Amazon Kindle DX."
 
@@ -401,15 +403,19 @@ msgstr ""
 msgid "Disabled plugins"
 msgstr "תוספים מבוטלים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "לא נמצאו תוספים תקינים ב- "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -417,29 +423,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "הוסף רכיב  על ידי הגדרת הנתיב לקובץ ZIP המכיל אותו."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "הסר רכיב מותאם לפי שם. ללא השפעה על הרכיבים המותקנים בהתקנה ראשונית."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "התאמת רכיב. ציין שם רכיב ומחרוזת התאמה מופרדים על ידי פסיק."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "הצג את כל הרכיבים המותקנים."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -453,59 +459,70 @@ msgid ""
 "first one that exists will be used"
 msgstr "רשימת ספריות מופרדות בפסיקל שליחת ספרשת  למכשיר."
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "הגדרות דרייברים למכשיר."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "רשימת סוגי קבצים שהמכשיר מסוגל לקבל."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "חדשות"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "מתקשר עם Binatone Readme eBook reader."
@@ -528,6 +545,10 @@ msgstr "מחליף נתונים עם Cybook Gen 3 / Opus eBook reader."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "מחליף נתונים עם EB600 eBook reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -540,6 +561,10 @@ msgstr "מתקשר עם מכשיר Entourage Edge"
 msgid "Communicate with the ESlick eBook reader."
 msgstr "מחליף נתונים עם ESlick eBook reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -554,14 +579,20 @@ msgstr "ממשק המכשיר"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "מחליף נתונים עם Hanlin V3 eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "מחליף נתונים עם Hanlin V5 eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "מחליף נתונים עם BOOX eBook reader."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "מחליף נתונים עם Hanvon N520 eBook reader."
@@ -588,7 +619,7 @@ msgstr "מחליף נתונים עם IRex Iliad eBook reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -608,15 +639,15 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
@@ -660,13 +691,13 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -687,61 +718,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "לא מצליח למצוא את כונן %s. נסה לאתחל את המכשיר."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "לא מצליח למצוא את כונן %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "לא מצליח למצוא את כונן %s. המעבד מיצא גרסה נפרדת של SYSFS"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "לא מצליח להעלות זכרון ראשי (קוד שגיאה: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "למכשיר אין כרטיס זיכרון בחריץ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "החריץ הנבחר: %s לא נתמך."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "אין מספיק מקום פנוי על הזכרון הראשי."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "אין מספיק מקום פנוי על כרטיס הזכרון."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "חדשות"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "קבע תצורת מכשיר"
@@ -751,57 +771,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "שים קבצים בתיקיות משנה במידה והמכשיר תומך באפשרות."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "קרא מטר תגיות מקבצים במכשיר."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "תבנית לשליטה על אפשרויות שמירת ספרים."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "הגדרות נוספות"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "מחליף נתונים עם eBook reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "מקבל מידע ממכשיר..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "קורא את רשימת הספרים מההתקן..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "מעביר ספרים למכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "מוסיף ספרים לרשימת הספרים במכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "מסיר ספרים מהמכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "מסיר ספרים מרשימת הספרים במכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "שולח מטא תגיות למכשיר"
 
@@ -1398,15 +1422,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1714,84 +1738,88 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr ""
 
@@ -1799,7 +1827,7 @@ msgstr ""
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1898,6 +1926,10 @@ msgstr ""
 msgid "No cover found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1936,6 +1968,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1992,7 +2028,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
@@ -2276,6 +2312,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2481,7 +2519,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2558,23 +2596,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
@@ -2596,15 +3027,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
@@ -2723,17 +3149,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2752,17 +3178,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2784,6 +3210,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2843,7 +3321,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2861,8 +3339,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3542,11 +4020,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3627,12 +4100,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3840,11 +4313,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3865,279 +4346,291 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
@@ -4280,165 +4773,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4549,279 +5042,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4832,33 +5334,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4895,10 +5397,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
 
@@ -4914,68 +5417,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5084,6 +5588,27 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5290,11 +5815,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5333,67 +5853,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5750,12 +6278,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr ""
 
@@ -5868,12 +6396,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5905,25 +6433,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6165,11 +6693,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6205,54 +6733,203 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6264,112 +6941,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6465,282 +7120,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6770,15 +7396,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6839,82 +7485,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -6956,619 +7595,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8035,82 +8167,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8371,48 +8515,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8790,7 +8934,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8871,43 +9015,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9093,43 +9241,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9272,34 +9420,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9356,97 +9508,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9469,30 +9621,30 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9500,27 +9652,27 @@ msgstr ""
 "מקסימום קבצים להורדה. רק לגבי קבצים מתגיות <a href>. ברירת המחדל היא "
 "%default ."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "פרק הזמן בין הורדות. ברירת המחדל היא %default שניות."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 "קידוד האותיות של האתר להורדה. ברירת המחדל תנסה לנחש את הקידוד המתאים."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9529,7 +9681,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "לא להוריד דפי-סגנון CSS"
 
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 168fae0101..5f0196b75a 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-09 16:39+0000\n"
-"Last-Translator: Sheldon Pax <Unknown>\n"
+"POT-Creation-Date: 2010-06-11 22:51+0000\n"
+"PO-Revision-Date: 2010-06-11 18:44+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-10 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -30,8 +30,8 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -53,10 +53,10 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
@@ -104,39 +104,39 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:293
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:491
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1303
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:302
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:880
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:917
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1515
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1517
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1639
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
@@ -481,51 +481,51 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:75
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:81
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:214
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:217
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:282
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:318
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:921
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:947
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:325
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:952
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:499
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:703
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "Impostazioni dei driver del dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:705
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 "Lista ordinata dei formati che il dispositivo di lettura può accettare."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:776
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -613,7 +613,7 @@ msgstr "Comunica con il lettore eBook IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -693,7 +693,7 @@ msgstr ""
 "Lista di campi \"metadata\" separati da virgole da convertire in collezioni "
 "sul dispositivo. Fra le possibilità: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:142
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Senza nome"
@@ -752,22 +752,22 @@ msgstr "Il reader non contiene una scheda di memoria in questo slot."
 msgid "Selected slot: %s is not supported."
 msgstr "Lo slot selezionato: %s non è supportato."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:775
 msgid "There is insufficient free space in main memory"
 msgstr "Non c'è spazio sufficiente nella memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space on the storage card"
 msgstr "Non c'è spazio sufficiente nella scheda di memoria"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:809
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:815
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:843
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:141
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1399
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Notizie"
@@ -795,48 +795,48 @@ msgstr "Modello per controllare come i libri vengono salvati"
 msgid "Extra customization"
 msgstr "Ulteriori personalizzazioni"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Comunicare wcon un eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Reperimento informazioni del dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr ""
 "Reperimento della lista dei libri sul dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Trasferimento dei libri nel dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 "Aggiunta libri alla lista metadata nel dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Rimozione dei libri dal dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 "Cancellazione libri dalla lista metadata nel dispositivo di lettura in "
 "corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Invio dei metadata al dispositivo di lettura in corso..."
 
@@ -1594,15 +1594,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr "Errore nell'interpretare la data/orario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Conversione dell'inputi in HTML in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Transcodifica di un ebook in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Creazione in corso"
 
@@ -1977,24 +1977,24 @@ msgstr "Comic"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:848
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
 msgid "Title"
 msgstr "Titolo"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:849
 msgid "Author(s)"
 msgstr "Autore(i)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Editore"
 
@@ -2007,29 +2007,29 @@ msgstr "Produttore"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
 msgid "Comments"
 msgstr "Commenti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1030
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
 msgid "Tags"
 msgstr "Tag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
 msgid "Series"
 msgstr "Serie"
@@ -2039,13 +2039,13 @@ msgid "Language"
 msgstr "Lingua"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
 msgid "Timestamp"
 msgstr "Timestamp"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Pubblicato"
 
@@ -2984,20 +2984,24 @@ msgstr "Limita il massimo numero di job simultanei al numero delle CPU."
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy"
 msgstr "Copia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy to Clipboard"
 msgstr "Copia negli appunti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:395
 msgid "Choose Files"
 msgstr "Seleziona documenti"
 
@@ -3022,12 +3026,12 @@ msgid "The specified directory could not be processed."
 msgstr "Non é possibile elaborare la cartella indicata."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:608
 msgid "No books"
 msgstr "Nessun libro."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid "No books found"
 msgstr "Nessun libro trovato"
 
@@ -3188,12 +3192,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3292,8 +3296,8 @@ msgstr "Opzioni per il libro elettronico"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1362
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1380
 msgid "Catalog"
 msgstr "Catalogo"
 
@@ -4017,7 +4021,7 @@ msgid "RB Output"
 msgstr "Output RB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
 msgid "Choose the format to view"
 msgstr "Scegliere il formato da leggere"
 
@@ -4107,12 +4111,12 @@ msgid "Footer regular expression:"
 msgstr "Espressione regolare per il piè di pagina."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Espressione regolare non valida: %s"
 
@@ -4331,11 +4335,19 @@ msgstr ""
 "Selezionare i formati disponibili e il loro ordine per questo dispositivo di "
 "lettura."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:120
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:172
+msgid "Browse by covers"
+msgstr "Sfoglia per copertine"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4356,240 +4368,244 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:43
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Nessun dettaglio disponibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:143
 msgid "Device no longer connected."
 msgstr "Il dispositivo di lettura non più collegato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:248
 msgid "Get device information"
 msgstr "Ottieni informazioni sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:274
 msgid "Get list of books on device"
 msgstr "Ottieni la lista dei libri del dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:284
 msgid "Get annotations from device"
 msgstr "Ricevi annotazioni dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:293
 msgid "Send metadata to device"
 msgstr "Invia metadati al dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:302
 msgid "Upload %d books to device"
 msgstr "Invia %d libri nel dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:317
 msgid "Delete books from device"
 msgstr "Cancella i libri dal dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:334
 msgid "Download books from device"
 msgstr "Scarica libri dal dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
 msgid "View book on device"
 msgstr "Visualizza libro sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
 msgid "Set default send to device action"
 msgstr "Azione che specifica l'invio predefinito al dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
 msgid "Email to"
 msgstr "Invia messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to main memory"
 msgstr "Invia alla memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to storage card A"
 msgstr "Invia alla scheda di memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card B"
 msgstr "Invia alla scheda di memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:441
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:481
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:486
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:494
 msgid "Fetch annotations (experimental)"
 msgstr "Prendi annotazioni (sperimentale)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:609
 msgid "selected to send"
 msgstr "Selezione per l'invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Choose format to send to device"
 msgstr "Selezionare il formato da inviare al dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "No device"
 msgstr "Nessun dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:623
 msgid "Cannot send: No device is connected"
 msgstr "Non é possibile inviare: nessun dispositivo di lettura connesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:626
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
 msgid "No card"
 msgstr "Nessuna scheda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 "Non é possibile inviare: il dispositivo di lettura non ha schede di memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:672
 msgid "E-book:"
 msgstr "Libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
 msgid "Attached, you will find the e-book"
 msgstr "Troverete allegato il libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "di"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:677
 msgid "in the %s format."
 msgstr "nel formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:690
 msgid "Sending email to"
 msgstr "Spedizione di un messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:999
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1006
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:721
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertire automaticamente i libri selezionati prima di inviare con posta "
 "eletrronica?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Non é stato possibile inviare ilibri indicati via posta elettronica poiché "
 "non sono stati trovati formati adatti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:746
 msgid "Failed to email books"
 msgstr "Non é stato possibile inviare dei libri via posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:747
 msgid "Failed to email the following books:"
 msgstr "Non é stato possibile inviare via posta elettronica questi libri:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:751
 msgid "Sent by email:"
 msgstr "Inviato per posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
 msgid "News:"
 msgstr "Notizie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:779
 msgid "Attached is the"
 msgstr "Allegato c'é"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:790
 msgid "Sent news to"
 msgstr "Notizie inviate a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:820
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1000
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertire automaticamente i libri seguenti prima di inviare al dispositivo "
 "di lettura?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:849
 msgid "Sending catalogs to device."
 msgstr "Inviando i cataloghi al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
 msgid "Sending news to device."
 msgstr "Invio notizie al dispositivo di lettura in corso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
 msgid "Sending books to device."
 msgstr "Invio libri al dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1007
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -4598,11 +4614,11 @@ msgstr ""
 "nessun formato adequato é stato trovato. É necessario convertire il libro o "
 "i libri in un formato supportato dal vostro dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
 msgid "No space on device"
 msgstr "Spazio insufficiente sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1056
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4626,9 +4642,9 @@ msgstr "Salva &template"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:99
 msgid "Path"
 msgstr "Percorso"
 
@@ -4637,8 +4653,8 @@ msgstr "Percorso"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:100
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
 msgid "Formats"
 msgstr "Formati"
@@ -4810,8 +4826,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Errore"
@@ -4904,7 +4920,7 @@ msgid "Access log:"
 msgstr "File di log degli accessi:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:419
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
@@ -5099,7 +5115,7 @@ msgid "Sending to &device"
 msgstr "Invio al &dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferenze"
@@ -5477,9 +5493,9 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:850
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
 msgid "Date"
 msgstr "Data"
@@ -5496,68 +5512,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5892,7 +5909,7 @@ msgid "Choose formats for "
 msgstr "Selezionare formati per: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:876
 msgid "Books"
 msgstr "Libri"
 
@@ -5934,70 +5951,70 @@ msgstr "La copertina nel formato %s é invalida."
 msgid "Abort the editing of all remaining books"
 msgstr "Interrompere la modifica di tutti i libri rimanenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:449
 msgid "This ISBN number is valid"
 msgstr "Questo  numero ISBN è valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:452
 msgid "This ISBN number is invalid"
 msgstr "Questo  numero ISBN è valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
 msgid "Downloading cover..."
 msgstr "Scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Cannot fetch cover"
 msgstr "Impossibile scaricare la copertina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:572
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Impossibile scaricare la copertina</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:562
 msgid "The download timed out."
 msgstr "Lo scaricamento ha raggiunto il limite di tempo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "Non é stato possibile trovare  una copertina per questo libro. Si provi a "
 "specificare il codice ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:578
 msgid "Bad cover"
 msgstr "Copertina inutilizzabile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:579
 msgid "The cover is not a valid picture"
 msgstr "La copertina non é un'immagine accettabile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
 msgid "There were errors"
 msgstr "Si sono verificati errori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:613
 msgid "There were errors downloading social metadata"
 msgstr "Si sono verficiati errori nello scaricamento dei metadati sociali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:642
 msgid "Cannot fetch metadata"
 msgstr "Non é possibile scaricare i metadati."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:643
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "Dovete specificare alemno uno fra codice ISBN, titolo, autore o editore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:714
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:715
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 "Non é possibile aprire %s. Potrebbe essere in uso in un altro programma."
@@ -6495,12 +6512,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "Aggiungi il tag a quelli disponibili e applicalo al libro corrente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:442
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6827,11 +6844,11 @@ msgstr "Espressione regolare (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
@@ -6867,55 +6884,204 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Espressione regolare (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:33
+msgid "Save single format to disk..."
+msgstr "Salvataggio di formato individuale sul disco..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:49
+msgid "Edit metadata individually"
+msgstr "Modifica metadati individualmente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata in bulk"
+msgstr "Modifica metadati in gruppo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Download metadata and covers"
+msgstr "Scarica i metadati e le copertine"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:57
+msgid "Download only metadata"
+msgstr "Scarica solo i metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
+msgid "Download only covers"
+msgstr "Scarica solo le copertine"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only social metadata"
+msgstr "Scarica solo i metadati sociali"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:68
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:79
+msgid "Add books from a single directory"
+msgstr "Aggiungi libri da una singola cartella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:81
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Aggiungi libri da cartelle includendo le sotto-cartelle (Un libro per "
+"cartella, si assume che ogni documento di libro elettronico é lo stesso "
+"libro in formati differenti)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú di un libro per "
+"cartella, si assume che ogni documento di libro elettronico é differente)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Aggiungi un libro vuoto (Libro senza formati iniziali)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Salva su disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100
+msgid "Save to disk in a single directory"
+msgstr "Salva su disco in una singola cartella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1782
+msgid "Save only %s format to disk"
+msgstr "Salva sul disco solo il formato %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1785
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Leggi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:116
+msgid "View specific format"
+msgstr "Leggi uno specifico formato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:122
+msgid "Remove selected books"
+msgstr "Cancella i libri selezionati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:124
+msgid "Remove files of a specific format from selected books.."
+msgstr "Cancella i file di un formato specifico dai libri selezionati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove all formats from selected books, except..."
+msgstr "Cancella tutti i formati dai libri selezionati, tranne..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove covers from selected books"
+msgstr "Cancella le copertine dai libri selezionati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:145
+msgid "Convert individually"
+msgstr "Converti individualmente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:147
+msgid "Bulk convert"
+msgstr "Converti in gruppo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:151
+msgid "Create catalog of books in your calibre library"
+msgstr "Crea un catologo di libri dalla vostra collezione in Calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+msgid "Run welcome wizard"
+msgstr "Fai partire l'assistente di configurazione iniziale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:192
+msgid "Similar books..."
+msgstr "Libri simili..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:297
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:315
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:336
+msgid "Side bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:366
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Lavoro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Stato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progresso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Tempo di esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Ci sono %d processi in corso:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Lavoro sconosciuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Ci sono %d processi in attesa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Impossibile terminare il lavoro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 "Impossibile annullare i processi che comunicano col dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Il lavoro è già stato avviato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Non disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:278
+msgid "Jobs:"
+msgstr "Lavori:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:294
+msgid "Click to see list of active jobs."
+msgstr "Fare clic per vedere una lista dei lavori attivi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:354
 msgid " - Jobs"
 msgstr " - Lavori"
 
@@ -6927,112 +7093,112 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Giudizio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1029
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1033
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
 msgid "None"
 msgstr "Nessuno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> di %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1097
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:350
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:847
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:851
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1023
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:101
 msgid "Collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1082
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppio clic per <b>modificarmi</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:504
 msgid "Not allowed"
 msgstr "Non permesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:505
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7130,137 +7296,138 @@ msgstr "Invia le informazioni di debug alla console"
 msgid "Do not check for updates"
 msgstr "Non controllare gli aggiornamenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Libreria di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Percorso del database sbagliato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Se siete certi che l'operzione non é in corso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Non e' possibile incominciare "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s é giá in funzione."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "potrebbe essere attivo nella barra di sistema, nel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "la parte in alto a destra dello schermo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "la parte in basso a destra dello schermo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "Provate a far ripartire il computer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "provate a rimuovere il documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "posta in ui,py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Ricerca avanzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -7268,146 +7435,116 @@ msgstr ""
 "<p>Cerca nella lista dei libri per titolo, autore, editore, etichette, "
 "commenti, etc.<br><br> Parole separate da spazi e l'operatore AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Resetta ricerca veloce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr "Scegliere ricerca salvata o inserire il nome per la nuova ricerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Copia il testo della ricerca corrente (invece di cercare il nome)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Salva ricerca corrente sotto il nome indicato nella casella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Ordina per p&opolarità"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Fai corrispondere uno qualsiasi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Fai corrispondere tutti"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Aggiungi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Cancella libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Canc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Invia al dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Salva su disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Scarica notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Converti libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Leggi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Apri la cartella contenente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Visualizza i dettagli del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Libri dello stesso autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Libri in questa serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Libri di questo editore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Libri con lo stesso tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Configurazione di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7439,15 +7576,35 @@ msgstr "Il Libro non ha ne titolo ne ISBN"
 msgid "No matches found for this book"
 msgstr "Nessun risultato é stato trovato per questo libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:249
 msgid "Search"
 msgstr "Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:302
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:344
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Cerca (Per la ricerca avanzata fare clic sul bottone a sinistra)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:371
+msgid "Saved Searches"
+msgstr "Ricerche Salvate"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(tutti i libri)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Premi un tasto..."
@@ -7508,82 +7665,62 @@ msgstr "Svuota"
 msgid "&Alternate shortcut:"
 msgstr "Scorciatoia &alternativa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Lavori:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Fare clic per vedere una lista dei lavori attivi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
 msgid "Rename"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:155
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:158
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:162
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:169
 msgid "Manage "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:173
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:184
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:377
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:238
 msgid "Searches"
 msgstr "Ricerche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:451
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:452
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:652
+msgid "Sort by &popularity"
+msgstr "Ordina per p&opolarità"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match all"
+msgstr "Fai corrispondere tutti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match any"
+msgstr "Fai corrispondere uno qualsiasi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:661
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7629,200 +7766,61 @@ msgstr ""
 "I libri nella lista sono giá stati convertiti nel formato %s. Volete "
 "convertirli nuovamente?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Salvataggio di formato individuale sul disco..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Cerca (Per la ricerca avanzata fare clic sul bottone a sinistra)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Ricerche Salvate"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:189
 msgid "&Restore"
 msgstr "&Ripristina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "&Donate to support calibre"
 msgstr "&donate per supportare Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
 msgid "&Restart"
 msgstr "&Riavvia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Per maggiori informazioni e aiuto vedere il: <a href=\"%s\">Manuale "
 "d'uso</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:246
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s di <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Modifica metadati individualmente"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Modifica metadati in gruppo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Scarica i metadati e le copertine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Scarica solo i metadati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Scarica solo le copertine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Scarica solo i metadati sociali"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Aggiungi libri da una singola cartella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Aggiungi libri da cartelle includendo le sotto-cartelle (Un libro per "
-"cartella, si assume che ogni documento di libro elettronico é lo stesso "
-"libro in formati differenti)."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú di un libro per "
-"cartella, si assume che ogni documento di libro elettronico é differente)."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Aggiungi un libro vuoto (Libro senza formati iniziali)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Salva su disco in una singola cartella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Salva sul disco solo il formato %s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Leggi uno specifico formato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Cancella i libri selezionati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Cancella i file di un formato specifico dai libri selezionati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Cancella tutti i formati dai libri selezionati, tranne..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Cancella le copertine dai libri selezionati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Converti individualmente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Converti in gruppo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Crea un catologo di libri dalla vostra collezione in Calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Fai partire l'assistente di configurazione iniziale"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Libri simili..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
 msgid "Calibre Quick Start Guide"
 msgstr "Guida rapida di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Sfoglia per copertine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(tutti i libri)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:485
 msgid "Device: "
 msgstr "Dispositivo di lettura: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:519
 msgid "Connected "
 msgstr "Connesso "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:531
 msgid "Device database corrupted"
 msgstr "Database del dispositivo di lettura corrotto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:532
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7851,148 +7849,148 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:772
 msgid "Use library only"
 msgstr "Usare solo la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:773
 msgid "User annotations generated from main library only"
 msgstr "Annotazioni utente generate solo dalla biblioteca principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1214
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1527
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:604
 msgid "No books selected to fetch annotations from"
 msgstr "Nessun libro selezionato da cui prendere annotazioni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:629
 msgid "Merging user annotations into database"
 msgstr "Fondi le annotazioni utente nel database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:657
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr "%s<br />Ultima Pagina Letta: %d (%d%%)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:663
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr "%s<br />Ultima Pagina Letta: Posizione %d (%d%%)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:682
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr "<b>Posizione %d &bull; %s</b><br />%s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:691
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr "<b>Pagina %d &bull; %s</b><br />"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:696
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr "<b>Posizione %d &bull; %s</b><br />"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:816
 msgid "How many empty books?"
 msgstr "Quanti libri vuoti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:817
 msgid "How many empty books should be added?"
 msgstr "quanti libri vuoti si desidera aggiungere?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:916
 msgid "Uploading books to device."
 msgstr "Invio libri al dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
 msgid "EPUB Books"
 msgstr "Libri EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:878
 msgid "LRF Books"
 msgstr "Libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "HTML Books"
 msgstr "Libri HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:880
 msgid "LIT Books"
 msgstr "Libri LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "MOBI Books"
 msgstr "Libri MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:882
 msgid "Topaz books"
 msgstr "Libri Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:883
 msgid "Text books"
 msgstr "Libri TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:884
 msgid "PDF Books"
 msgstr "Libri PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:885
 msgid "Comics"
 msgstr "Fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:886
 msgid "Archives"
 msgstr "Archivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:890
 msgid "Supported books"
 msgstr "Libri supportati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:925
 msgid "Merged some books"
 msgstr "Uniti alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:926
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr "Alcune copie sono state trovate e unite con i seguenti libri:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:935
 msgid "Failed to read metadata"
 msgstr "Non é stato possibile leggere i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:936
 msgid "Failed to read metadata from the following"
 msgstr "Non é stato possibile leggere i metadati dai seguenti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
 msgid "Cannot delete"
 msgstr "Non si può cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1696
 msgid "No book selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:969
 msgid "Choose formats to be deleted"
 msgstr "Seleziona i formati da cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:987
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Seleziona i formati da <b>non</b> cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -8000,63 +7998,63 @@ msgstr ""
 "I libri selezionati saranno <b>cancellati permanentemente</b> e i documenti "
 "rimossi dal computer. Siete sicuri?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1061
 msgid "Deleting books from device."
 msgstr "Cancellamento libri dal dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1097
 msgid "Cannot download metadata"
 msgstr "Non é possibile scaricare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1113
 msgid "social metadata"
 msgstr "metadati sociali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "covers"
 msgstr "copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "metadata"
 msgstr "metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1117
 msgid "Downloading %s for %d book(s)"
 msgstr "Scaricamento %s per %d libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1139
 msgid "Failed to download some metadata"
 msgstr "Non si é riusciti a scaricare alcuni metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1140
 msgid "Failed to download metadata for the following:"
 msgstr "Non si é riusciti a scaricare i metadati per i seguenti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1143
 msgid "Failed to download metadata:"
 msgstr "Lo scaricamento dei metadati é fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1192
 msgid "Cannot edit metadata"
 msgstr "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1216
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1217
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1221
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -8064,7 +8062,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1232
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -8074,46 +8072,46 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1244
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
 msgid "Choose destination directory"
 msgstr "Scegliere la cartella di destinazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1379
 msgid "Error while saving"
 msgstr "Errore durante il salvataggio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
 msgid "There was an error while saving."
 msgstr "Si é verificato un errore durante il salvataggio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Could not save some books"
 msgstr "Non é stato possibile salvare tutti i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Click the show details button to see which ones."
 msgstr "Selezionare il tasto dei dettagli per vedere quali."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1410
 msgid "No books selected to generate catalog for"
 msgstr "Nessun libro selezionato per la generazione del catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1427
 msgid "Generating %s catalog..."
 msgstr "Generando %s catalogo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -8121,44 +8119,44 @@ msgstr ""
 "Nessun libro da catalogare\n"
 "Controlla i tag esclusi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1443
 msgid "Catalog generated."
 msgstr "Catalogo generato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1446
 msgid "Export Catalog Directory"
 msgstr "Esporta il catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1447
 msgid "Select destination for %s.%s"
 msgstr "Selezionare una destinazione per %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1461
 msgid "Fetching news from "
 msgstr "Scaricamento notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid " fetched."
 msgstr " preso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1555
 msgid "Starting conversion of %d book(s)"
 msgstr "Conversione di %d libro/libri incominciata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1729
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1685
 msgid "Multiple Books Selected"
 msgstr "Piú di un libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1686
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -8170,46 +8168,46 @@ msgstr ""
 "vostro computer. Una volta cominciato questa azione non puó essere fermata "
 "finché il processo é completato. Siete sicuri di voler continuare?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1695
 msgid "Cannot open folder"
 msgstr "Impossibile aprire la cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1730
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1764
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1765
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1818
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Non è disponibile alcuna informazione dettagliata per i libri nel "
 "dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1870
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -8217,12 +8215,12 @@ msgstr ""
 "Si è verificato un errore di comunicazione temporaneo col dispositivo di "
 "lettura. Disconnettere e riconnettere il dispositivo e/o riavviare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1900
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1928
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1901
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8231,15 +8229,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. É necessario rimuovere la DRM usando un prodotto da "
 "terzi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1914
 msgid "Recipe Disabled"
 msgstr "Ricetta deattivata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1929
 msgid "<b>Failed</b>"
 msgstr "<b>Operazione Fallita</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1969
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -8247,11 +8245,11 @@ msgstr ""
 "è il risultato degli sforzi di tanti volontari da tutto il mondo. Se lo "
 "trovi utile, puoi fare una donazione per supportare il suo sviluppo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1994
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Ci sono lavori attivi. Uscire comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1997
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8262,11 +8260,11 @@ msgstr ""
 "sul dispositivo di lettura.<br>\n"
 "                      Siete sicuri di voler interrompere il processo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2001
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2053
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8274,7 +8272,7 @@ msgstr ""
 "continuerà a lavorare nel vassoio di sistema. Per chiuderlo, selezionare "
 "<b>Esci</b> nel menu contestuale del vassoio di sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2072
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8282,11 +8280,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2080
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2081
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8774,15 +8772,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Stampa del libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Copia immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Incolla immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8792,7 +8790,7 @@ msgstr ""
 "%d\n"
 "libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8802,7 +8800,7 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8812,7 +8810,7 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8822,52 +8820,64 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Seleziona per vedere i libri disponibili sul vostro computer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 "Seleziona per vedere i libri disponibili sulla memoria principale del vostro "
 "dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 "Seleziona per vedere i libri disponibili sulla scheda di memoria A nel "
 "vostro dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 "Seleziona per vedere i libri disponibili sulla scheda di memoria B nel "
 "vostro dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Modificare capitalizzazioned dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Maiuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Minuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Inverti capitalizzazione dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Caratteri per titolo"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9836,28 +9846,28 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1665
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Sto migrando il vecchio database nella nuova biblioteca in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694
 msgid "Copying <b>%s</b>"
 msgstr "Sto copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1711
 msgid "Compacting database"
 msgstr "Compattazione database"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1804
 msgid "Checking SQL integrity..."
 msgstr "Controllo di integrita' SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1845
 msgid "Checking for missing files."
 msgstr "Controllo per file mancanti"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1867
 msgid "Checked id"
 msgstr "ID controllate"
 
@@ -10357,93 +10367,93 @@ msgstr ""
 "Non scaricare l'ultima versione delle ricette di sistema dal server di "
 "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Sorgente di notizie sconosciuta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:605
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "La ricetta \"%s\" richiede un nome utente e password."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid "Download finished"
 msgstr "Scaricamento completato"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "Failed to download the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download parts of the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito parzialmente:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:712
 msgid " from "
 msgstr " da "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
 msgid "\tFailed links:"
 msgstr "\tLink falliti:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:831
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Non é stato possibile ottnere l'articolo. Provare a eseguire con l'opzione -"
 "vv per maggiori informazioni sulla ragione."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:852
 msgid "Fetching feeds..."
 msgstr "Scaricamento feed..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
 msgid "Got feeds from index page"
 msgstr "Ricevuti feed dalla pagina principale"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
 msgid "Trying to download cover..."
 msgstr "Tentativo di scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:865
 msgid "Generating masthead..."
 msgstr "Preparazione dell'immagine principale in corso"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:946
 msgid "Starting download [%d thread(s)]..."
 msgstr "Inizio scaricamento [%d articolo(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Feeds downloaded to %s"
 msgstr "Feed scaricati in %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:972
 msgid "Could not download cover: %s"
 msgstr "Impossibile scaricare la copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:984
 msgid "Downloading cover from %s"
 msgstr "Scaricamento copertina da %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1024
 msgid "Masthead image downloaded"
 msgstr "Immagine principale scaricata"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1220
 msgid "Untitled Article"
 msgstr "Articolo senza titolo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Article downloaded: %s"
 msgstr "Articolo scaricato: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1302
 msgid "Article download failed: %s"
 msgstr "Scaricamento fallito dell'articolo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1319
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1466
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10451,7 +10461,7 @@ msgstr ""
 "Impossibile accedere, controllare il nome utente e password per il servizio "
 "Periodici di calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1482
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/ja.po b/src/calibre/translations/ja.po
index 6a923ff73b..3c70a2c7b8 100644
--- a/src/calibre/translations/ja.po
+++ b/src/calibre/translations/ja.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-16 04:18+0000\n"
-"PO-Revision-Date: 2010-05-07 18:16+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 16:51+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-20 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,13 +23,12 @@ msgstr "まったく何もしません。（何も影響しません。）"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:204
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -41,21 +40,22 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:912
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -71,9 +71,9 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:980
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:908
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:913
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:979
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -97,47 +97,50 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:28
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:583
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:441
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1697
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:311
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:248
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:260
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:680
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:717
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1113
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1235
-#: /home/kovid/work/calibre/src/calibre/library/server.py:671
-#: /home/kovid/work/calibre/src/calibre/library/server.py:747
-#: /home/kovid/work/calibre/src/calibre/library/server.py:794
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
+#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -158,11 +161,11 @@ msgstr "ファイル形式"
 msgid "Metadata reader"
 msgstr "メタデータ読み込み"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "メタデータ書き出し"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr ""
 
@@ -269,7 +272,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:256
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:266
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr "SONY PRS(500/505/600/700 etc)用のプロファイルです。"
@@ -279,62 +282,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "SONY PRS 300用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "SONY PRS-900用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:320
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Microsoft Reader用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Mobipocket books用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Hanlin V3とその派生品用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:356
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Hanlin V5とその派生品用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:364
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Cybook G3用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:377
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Cybook Opus用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Amazon Kindle用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:423
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Irex Illiad用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:436
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "IRex Digital Reader 1000用のプロファイルです。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:450
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:464
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "B&N Nook用のプロファイルです。"
 
@@ -349,25 +352,30 @@ msgid ""
 "devices."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:269
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
+msgid ""
+"Intended for the iPad and similar devices with a resolution of 768x1024"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:281
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "SONY PRS-300用のプロファイルです。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:299
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "5-inch JetBook用のプロファイルです。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:308
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr "SONY PRS(500/505/700 etc)のランドスケープモード用のプロファイルです。主に漫画で使用されます。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:406
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Amazon Kindle DX用のプロファイルです。"
 
@@ -387,15 +395,19 @@ msgstr "ローカルのプラグインのカスタマイズ"
 msgid "Disabled plugins"
 msgstr "プラグインを無効にする"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "有効なプラグインが見つからない "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "プラグイン%sの初期化に失敗してトレースバック"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -403,29 +415,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "それが含まれているzipファイルへのパスを指定して、プラグインを追加します。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "カスタムのプラグインを名前によって取り除きます。ビルトインのプラグインには影響はありません。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "プラグインをカスタマイズします。プラグインの名前とカスタマイズした文字列は、コンマで区切って指定します。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "インストールされたプラグインを一覧表示"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "名付けたプラグインを有効にする"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "名付けたプラグインを無効にする"
 
@@ -433,16 +445,76 @@ msgstr "名付けたプラグインを無効にする"
 msgid "Communicate with Android phones."
 msgstr "Androidフォンと通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:39
 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:64
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "電話機 S60 と通信します。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
+msgid ""
+"Some books not found in iTunes database.\n"
+"Delete using the iBooks app.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
+msgid "settings for device drivers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+msgid "Ordered list of formats the device will accept"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "ニュース"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "電子書籍リーダー Binatone Readme と通信します。"
@@ -465,6 +537,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -477,31 +553,55 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
+#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
+msgid "Device Interface"
+msgstr "デバイス・インターフェース"
+
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:95
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:114
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
+msgid "Communicate with The Book reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
 msgstr "電子書籍リーダー SpringDesign Alex と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
 msgid "Communicate with the Azbooka"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
 msgid "Communicate with the Elonex EB 511 eBook reader."
 msgstr "電子書籍リーダー Elonex EB 511 と通信します。"
 
@@ -511,14 +611,10 @@ msgstr "IRex Iliad 電子書籍リーダ─と通信します。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
-msgid "Device Interface"
-msgstr "デバイス・インターフェース"
-
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
 msgstr "IRex Digital Reader 1000 電子書籍リーダ─と通信します。"
@@ -535,27 +631,27 @@ msgstr "電子書籍リーダー Iriver Story と通信します。"
 msgid "Communicate with the JetBook eBook reader."
 msgstr "JetBook 電子書籍リーダ─と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Kindle 電子書籍リーダ─と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Kindle 2 電子書籍リーダ─と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Kindle DX 電子書籍リーダ─と通信します。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
+msgid "Communicate with the Kobo Reader"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Palm Pre と通信します。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
-msgid "Communicate with the Kobo Reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
@@ -583,52 +679,20 @@ msgstr "Nuut2 電子書籍リーダ─と通信します。"
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Sony PRS-500 電子書籍リーダ─と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
-msgstr "デバイス内の書籍リストを取得しています..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
+msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "デバイスに書籍を転送しています..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "デバイスから書籍を削除しています..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "デバイスにメタデータを送信しています..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "Sony PRS-600/700/900 電子書籍リーダ─と通信します。"
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
@@ -638,108 +702,125 @@ msgstr "電子書籍リーダー Samsung SNE と通信します。"
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Teclast K3 電子書籍リーダーと通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:252
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
+msgid "Communicate with the Newsmy reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
+msgid "Communicate with the iPapyrus reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "%sディスク・ドライブが検出できない場合は、再起動してください。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:425
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "%s のマウントポイントを検出できませんでした。再起動してみてください。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:490
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "%s ディスクドライブを検出できませんでした。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:583
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "マウントヘルパーが見つかりませんでした: %s。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:595
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:603
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:740
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "メインメモリに十分な空きスペースがありません"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "記録媒体のカードに十分な空きスペースがありません"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:811
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:842
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:589
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:995
-msgid "News"
-msgstr "ニュース"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
 msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+msgid "Getting list of books on device..."
+msgstr "デバイス内の書籍リストを取得しています..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+msgid "Transferring books to device..."
+msgstr "デバイスに書籍を転送しています..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
+msgid "Removing books from device..."
+msgstr "デバイスから書籍を削除しています..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
+msgid "Sending metadata to device..."
+msgstr "デバイスにメタデータを送信しています..."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr ""
@@ -985,18 +1066,18 @@ msgstr ""
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
 "conversion process a bug is occurring."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:110
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111
 msgid ""
 "Specify the input profile. The input profile gives the conversion system "
 "information on how to interpret various information in the input document. "
@@ -1004,7 +1085,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122
 msgid ""
 "Specify the output profile. The output profile tells the conversion system "
 "how to optimize the created document for the specified device. In some "
@@ -1012,7 +1093,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133
 msgid ""
 "The base font size in pts. All font sizes in the produced book will be "
 "rescaled based on this size. By choosing a larger size you can make the "
@@ -1020,7 +1101,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:142
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
 "Mapping from CSS font names to font sizes in pts. An example setting is "
 "12,12,14,16,18,20,22,24. These are the mappings for the sizes xx-small to xx-"
@@ -1029,17 +1110,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:154
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
 msgid ""
 "The line height in pts. Controls spacing between consecutive lines of text. "
 "By default no line height manipulation is performed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170
 msgid ""
 "Some badly designed documents use tables to control the layout of text on "
 "the page. When converted these documents often have text that runs off the "
@@ -1047,58 +1128,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:188
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level three. Each entry is added under the previous level two "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:212
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "目次に自動判定された章を追加しない"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:219
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
 "the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the threshold "
 "number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:234
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235
 msgid ""
 "Remove entries from the Table of Contents whose titles match the specified "
 "regular expression. Matching entries and all their children are removed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:245
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or <h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
@@ -1108,7 +1189,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:259
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -1116,39 +1197,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:269
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will be appended to "
 "the style rules from the source file, so it can be used to override those "
 "rules."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:278
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:284
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285
 msgid ""
 "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290
 msgid ""
 "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:294
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295
 msgid ""
 "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300
 msgid ""
 "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306
 msgid ""
 "Change text justification. A value of \"left\" converts all justified text "
 "in the source to left aligned (i.e. unjustified) text. A value of "
@@ -1157,73 +1238,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
 "Remove spacing between paragraphs. Also sets an indent on paragraphs of "
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
 msgid ""
 "When calibre removes inter paragraph spacing, it automatically sets a "
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:329
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:335
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:336
 msgid ""
 "Insert a blank line between paragraphs. Will not work if the source file "
 "does not use paragraphs (<p> or <div> tags)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:342
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343
 msgid ""
 "Remove the first image from the input ebook. Useful if the first image in "
 "the source file is a cover and you are specifying an external cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:350
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351
 msgid ""
 "Insert the book metadata at the start of the book. This is useful if your "
 "ebook reader does not support displaying/searching metadata directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:358
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359
 msgid ""
 "Attempt to detect and correct hard line breaks and other problems in the "
 "source file. This may make things worse, so use with care."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
 msgid "Use a regular expression to try and remove the header."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
 msgid "The regular expression to use to remove the header."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
 msgid "Use a regular expression to try and remove the footer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
 msgid "The regular expression to use to remove the footer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
 msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:400
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
 msgid ""
 "Transliterate unicode characters to an ASCII representation. Use with care "
 "because this will replace unicode characters with ASCII. For instance it "
@@ -1233,111 +1314,121 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:415
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:416
+msgid ""
+"Preserve ligatures present in the input document. A ligature is a special "
+"rendering of a pair of characters like ff, fi, fl et cetera. Most readers do "
+"not have support for ligatures in their default fonts, so they are unlikely "
+"to render correctly. By default, calibre will turn a ligature into the "
+"corresponding pair of normal characters. This option will preserve them "
+"instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
 msgid "Set the title."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:419
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
 msgid "Set the authors. Multiple authors should be separated by ampersands."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:424
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:436
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
 msgid "Set the ebook description."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:440
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:453
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56
 msgid "Set the ebook publisher."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:444
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:457
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60
 msgid "Set the series this ebook belongs to."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:448
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:452
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
 msgid "Set the rating. Should be a number between 1 and 5."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:456
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:469
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66
 msgid "Set the ISBN of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:460
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:473
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
 msgid "Set the tags for the book. Should be a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:464
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
 msgid "Set the book producer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:468
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:481
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72
 msgid "Set the language."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:472
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:476
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:576
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "この書庫からはebookを見つけられませんでした。"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:634
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:641
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:788
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:815
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:902
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
 "The contents of the directory are first deleted, so be careful."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
 "Turn off splitting at page breaks. Normally, input files are automatically "
 "split at every page break into two files. This gives an output ebook that "
@@ -1346,21 +1437,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:75
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
 "Split all HTML files larger than this size (in KB). This is necessary as "
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
 "Normally, if the input file has no cover and you don't specify one, a "
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
 "Do not use SVG for the book cover. Use this option if your EPUB is going to "
 "be used ona  device that does not support SVG, like the iPhone or the "
@@ -1368,6 +1459,19 @@ msgid ""
 "blank page."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
+msgid ""
+"When using an SVG cover, this option will cause the cover to scale to cover "
+"the available screen area, but still preserve its aspect ratio (ratio of "
+"width to height). That means there may be white borders at the sides or top "
+"and bottom of the image, but the image will never be distorted. Without this "
+"option the image may be slightly distorted, but there will be no borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
+msgid "Start"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
@@ -1622,80 +1726,88 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:363
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:416
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "書籍名"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:421
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "著者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:365
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "発行元"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:367
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:95
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "コメント"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "タグ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:96
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "シリーズ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "発行日"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr ""
 
@@ -1703,7 +1815,7 @@ msgstr ""
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1802,44 +1914,52 @@ msgstr ""
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "タグ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:136
 msgid "Downloads metadata from Google Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:152
 msgid "Downloads metadata from isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:181
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:180
 msgid ""
 "To use isbndb.com you must sign up for a %sfree account%s and enter your "
 "access key below."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:189
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:188
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1896,8 +2016,8 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1103
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
 
@@ -1936,74 +2056,74 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "%s　フォーマットは対応してません"
 
@@ -2020,10 +2140,6 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
@@ -2047,7 +2163,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2055,7 +2171,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2184,6 +2300,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2283,6 +2401,12 @@ msgstr ""
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
+msgid ""
+"Preserve the aspect ratio of the cover, instead of stretching it to fill the "
+"ull first page of the generated pdf."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr ""
@@ -2311,13 +2435,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+msgid ""
+"Normally extra spaces are condensed into a single space. With this option "
+"all spaces will be displayed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2348,191 +2478,778 @@ msgid ""
 "allows max-line-length to be below the minimum"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
-msgid "Sort tags list by popularity"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Number of covers to show in the cover browsing mode"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
-msgid "Defaults for conversion to LRF"
+msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+msgid "tag browser categories not to display"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "メタデータをダウンロードできません"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "エラー"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "メタデータを編集できません"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "ディスクに保存できません"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 msgid "The specified directory could not be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1822
-msgid "No books found"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:341
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:354
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
+msgid "Searching for sub-folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
+msgid "Searching for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
+msgid "Looking for duplicates based on file hash"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
+msgid "Choose root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
+msgid "Invalid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
+msgid "is not a valid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
+msgid "Add books to calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
+msgid "WizardPage"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
+msgid "Scanning root folder for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
+msgid "This may take a few minutes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
+msgid "Choose the location to add books from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
+msgid "Select a folder on your hard disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
+msgid ""
+"<p>calibre can scan your computer for existing books automatically. These "
+"books will then be <b>copied</b> into the calibre library. This wizard will "
+"help you customize the scanning and import process for your existing book "
+"collection.</p>\n"
+"<p>Choose a root folder. Books will be searched for only inside this folder "
+"and any sub-folders.</p>\n"
+"<p>Make sure that the folder you chose for your calibre library <b>is "
+"not</b> under the root folder you choose.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
+msgid "&Root folder:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
+msgid ""
+"This folder and its sub-folders will be scanned for books to import into "
+"calibre's library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
+msgid "..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:67
+msgid "Handle multiple files per book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
+msgid ""
+"&One book per folder, assumes every ebook file in a folder is the same book "
+"in a different format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
+msgid ""
+"&Multiple books per folder, assumes every ebook file is a different book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "パス名"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "なし"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2573,10 +3290,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66
@@ -2584,15 +3301,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2609,9 +3326,9 @@ msgid "E-book options"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:282
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:958
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:976
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -2776,46 +3493,6 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 msgid ""
 "The debug process outputs the intermediate HTML generated at various stages "
@@ -2827,26 +3504,30 @@ msgstr ""
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:46
-msgid "Split files &larger than:"
-msgstr "これ以上大きいファイルは分割する："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:47
-msgid " KB"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
+msgid "Preserve cover &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
+msgid "Split files &larger than:"
+msgstr "これ以上大きいファイルは分割する："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
+msgid " KB"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
@@ -2896,15 +3577,15 @@ msgid "&Base font size:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
 msgid "Font size &key:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:118
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:125
@@ -2943,75 +3624,79 @@ msgstr "外観"
 msgid "Control the look and feel of the output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
+msgid "Original"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
+msgid "Left align"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
+msgid "Justify text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
 msgid "Wizard to help you choose an appropriate font size key"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
 msgid ""
 "<p>When calibre removes inter paragraph spacing, it automatically sets a "
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:139
-msgid "&Linearize tables"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:140
-msgid "&Transliterate unicode characters to ASCII."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:141
-msgid "Extra &CSS"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:142
-msgid "Insert &blank line"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:144
-msgid "justify"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
+msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:145
-msgid "left"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
+msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:146
-msgid "original"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
+msgid "&Transliterate unicode characters to ASCII"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
+msgid "Insert &blank line"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
+msgid "Keep &ligatures"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
@@ -3079,38 +3764,38 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:101
 msgid "Choose cover for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:108
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126
 msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
 msgid "Book Cover"
 msgstr "本のカバー"
 
@@ -3119,28 +3804,28 @@ msgid "Use cover from &source file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
 msgid "Change &cover image:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 msgid "&Title: "
 msgstr "タイトル(&T): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
 msgid "Change the title of this book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "&Author(s): "
 msgstr "作者(&A): "
 
@@ -3155,41 +3840,41 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
 msgid "&Publisher: "
 msgstr "発行者(&P): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "Ta&gs: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
 msgid "&Series:"
 msgstr "シリーズ(&S):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "List of known series. You can add new series."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
 msgid "Book "
 msgstr ""
 
@@ -3274,12 +3959,12 @@ msgid "PDB Input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 msgid "Treat each &line as a paragraph"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Assume print formatting"
 msgstr ""
 
@@ -3307,32 +3992,31 @@ msgstr ""
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
+msgid "Preserve &aspect ratio of cover"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2067
-msgid "Choose the format to view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "No formats available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
@@ -3404,12 +4088,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "無効な正規表現です"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "次の正規表現は無効です。:%s"
 
@@ -3493,21 +4177,25 @@ msgstr ""
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Process using markdown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
 msgid ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
 msgid "Do not insert Table of Contents into output text when using markdown"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
+msgid "Preserve &spaces"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
 msgstr ""
@@ -3613,245 +4301,322 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242
+msgid "Undefined"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
+msgid "Yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
+msgid "No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "後、ライブラリから削除"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "既定のデバイス送信処理を設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:331
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:333
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "メインメモリに送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "ストレージカードAに送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:350
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "ストレージカードBに送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-msgstr "フォーマットを指定してメインメモリに送信"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Main Memory"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
-msgstr "フォーマットを指定してストレージカードAに送信"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+msgid "Send and delete from library"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
-msgstr "フォーマットを指定してストレージカードBに送信"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
+msgid "Send specific format"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "フォーマットを指定して送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "送信できません: デバイスが接続されていません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "送信できません: デバイスにストレージカードがありません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:585
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:629
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:636
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:789
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "デバイスにカタログを送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "デバイスにニュースを送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "デバイスに書籍を送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:93
-msgid "Path"
-msgstr "パス名"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Formats"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
@@ -3900,11 +4665,11 @@ msgstr ""
 msgid "Choose Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
 msgstr ""
 
@@ -3920,210 +4685,241 @@ msgstr "著者(&A):"
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
+msgid "Edit Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:173
 msgid "%(plugin_type)s %(plugins)s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr "変換設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
 msgstr "全般"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Auto send"
 msgstr "自動送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:224
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:222
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
 msgid "new email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
-"port. You operating system <b>may</b> not allow the server to run on this "
+"port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "エラー"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+msgid "Do you really want to delete column %s and all its data?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
+msgid ""
+"The changes you made require that Calibre be restarted. Please restart as "
+"soon as practical."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4234,259 +5030,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "デバイスに送信(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "基本設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "電子書籍の場所(&L) (電子書籍は著者別のフォルダに格納され、メタデータは metadata.db に格納されます。)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "最新のバージョンが利用可能なときに通知する(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "既定のネットワーク・タイムアウト(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "言語を選択(&L) (再起動が必要です):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "既定の出力フォーマット(&O):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "入力フォーマットの優先順位(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "シリーズ番号にローマ数字を使用(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "システムトレイアイコンを有効にする(&T) (再起動が必要)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "システムトレイの通知を有効にする(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+msgid "Show &splash screen at startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "表紙ブラウズを別ウインドウで行う(&B) (再起動が必要)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "入力中に検索する"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "ダウンロードしたニュースを電子書籍リーダーに自動的に送信する(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "ニュースが自動的にリーダーに転送されるとき、ライブラリから削除する(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+msgid "Max. OPDS &ungrouped items:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4501,33 +5326,33 @@ msgstr ""
 "http://myhostname:8080 を登録してください。myhostname "
 "はcalibreが稼働しているコンピュータのホスト名、もしくはIPアドレスです。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "プラグインを有効化/無効化(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "プラグインをカスタマイズ(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "プラグインを削除(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "プラグインを追加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4555,16 +5380,6 @@ msgstr ""
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
@@ -4574,8 +5389,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "日付"
 
@@ -4591,6 +5409,128 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
+msgid "Comma separated text, like tags, shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
+msgid "Long text, like comments, not shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
+msgid ""
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
+msgid ""
+"The lookup name must be lower case and cannot contain \":\"s or spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:117
+msgid "Create or edit custom columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
+msgid "&Lookup name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
+msgid "Column &heading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:104
+msgid ""
+"Used for searching the column. Must contain only digits and lower case "
+"letters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
+msgid ""
+"Column heading in the library view and category name in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
+msgid "Column &type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
+msgid "What kind of information will be kept in the column."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
+msgid ""
+"<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's "
+"for year.</p>\n"
+"<p>For example:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy gives 05 January 10</li>\n"
+"</ul> "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
+msgid "Use MMM yyyy for month + year, yyyy for year only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
+msgid "Default: dd MMM yyyy."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
+msgid "Format for &dates"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
 msgstr ""
@@ -4632,10 +5572,6 @@ msgstr ""
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
@@ -4644,6 +5580,27 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -4738,83 +5695,78 @@ msgstr ""
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:22
-msgid "Editing meta information for %d books"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:24
+msgid "Editing meta information for <b>%d books</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "メタ情報を編集"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "メタ情報"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
 msgid ""
 "Selected books will be automatically numbered,\n"
 "in the order you selected them.\n"
@@ -4822,195 +5774,223 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
+msgid ""
+"Remove stored conversion settings for the selected books.\n"
+"\n"
+"Future conversion of these books will use the default settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
+msgid "Remove &stored conversion settings for the selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412
+msgid "&Basic metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
+msgid "&Custom metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
 msgid "Not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1284
-msgid "Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:168
 msgid "You do not have permission to read the following files:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:207
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:208
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:257
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Edit Meta Information"
 msgstr "メタ情報を編集"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+msgid "Meta information"
+msgstr "メタ情報"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr "作者とタイトルの入れ替え"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
 msgid "IS&BN:"
 msgstr "IS&BN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
 msgid "Publishe&d:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "dd MMM yyyy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
 msgid "&Date:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
 msgid "&Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
 msgid "&Fetch metadata from server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
 msgid "Available Formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
 msgid "Add a new format for this book to the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
 msgid "Remove the selected formats for this book from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Set the cover for the book from the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
 msgid "Update metadata from the metadata in the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
 msgid "Reset cover to default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411
 msgid "Download &cover"
 msgstr ""
 
@@ -5022,48 +6002,81 @@ msgstr ""
 msgid "Aborting..."
 msgstr "停止中..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54
+msgid ""
+"The current saved search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
 msgid "You must provide a username and/or password to use this news source."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
 msgstr "ニュースのダウンロード・スケジュール"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
 msgstr "カスタム・ニュースソースを追加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
 msgid "Download all scheduled new sources"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
 msgstr ""
 
@@ -5258,11 +6271,79 @@ msgstr ""
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
+msgid " (not on any book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
+msgid ""
+"The current tag category will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
+msgid "User Categories Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
+msgid "A&vailable items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
+msgid "Apply tags to current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
+msgid "A&pplied items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
+msgid "Unapply (remove) tag from current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
+msgid "Category name: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
+msgid "Select a category to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
+msgid "Delete this selected tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
+msgid "Enter a new category name. Select the kind before adding it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
+msgid "Add the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
+msgid "Category filter: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
+msgid "Select the content kind of the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:93
 msgid "Are your sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
 msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
@@ -5308,6 +6389,66 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
+msgid "Item is blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
+msgid "Item already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
+msgid "The item %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
+msgid "No item selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
+msgid "You must select one item from the list of Available items."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
+msgid "No items selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
+msgid "You must select at least one items from the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
+msgid "Are you certain you want to delete the following items?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Category Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+msgid "Rename the item in every book where it is used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr ""
@@ -5546,11 +6687,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "該当するものはありません"
 
@@ -5586,98 +6727,303 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "メタデータを個別に編集"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "複数のメタデータを編集"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "メタデータ・表紙をダウンロード"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "メタデータのみダウンロード"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "表紙のみダウンロード"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "一つのディレクトリから書籍を追加"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "ディスクに保存"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "指定したフォーマットで表示"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "個別に変換"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "ウェルカム・ウィザードを開始"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "ジョブ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "ステータス"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "進行状況"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "不明なジョブ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "利用不能"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1161
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "N"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "Y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "サイズ (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "評価"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:440
-msgid "None"
-msgstr "なし"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
+msgid "Size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
@@ -5752,273 +7098,269 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:74
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "クイック検索をリセット"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:382
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:383
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:384
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "書籍を追加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "書籍を削除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "メタ情報を編集"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
-msgid "Merge books"
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "デバイスに送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
-msgid "Save to disk"
-msgstr "ディスクに保存"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "ニュースの読み込み"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "電子書籍に変換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6048,11 +7390,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "検索"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "検索 (高度な検索は左のボタンをクリック)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6113,44 +7479,77 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:163
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "書籍の表紙をブラウズ"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "クリックで表紙ブラウズを終了"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:206
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
+msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
+msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
+msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -6190,592 +7589,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:67
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:148
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "検索 (高度な検索は左のボタンをクリック)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:154
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:177
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "calibreに寄付する(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>ヘルプをご覧になるには <a href=\"%s\">ユーザー・マニュアル</a> を参照してください。<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:273
-msgid "Edit metadata individually"
-msgstr "メタデータを個別に編集"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:275
-msgid "Edit metadata in bulk"
-msgstr "複数のメタデータを編集"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:277
-msgid "Download metadata and covers"
-msgstr "メタデータ・表紙をダウンロード"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:278
-msgid "Download only metadata"
-msgstr "メタデータのみダウンロード"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:279
-msgid "Download only covers"
-msgstr "表紙のみダウンロード"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:280
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:284
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:293
-msgid "Add books from a single directory"
-msgstr "一つのディレクトリから書籍を追加"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:297
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:300
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2172
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:358
-msgid "View specific format"
-msgstr "指定したフォーマットで表示"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:365
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:367
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:406
-msgid "Convert individually"
-msgstr "個別に変換"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:407
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:410
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
-msgid "Run welcome wizard"
-msgstr "ウェルカム・ウィザードを開始"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:462
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:745
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:901
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:903
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:931
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:943
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:944
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1180
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1181
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1917
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1012
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1071
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1090
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1099
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1104
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1224
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1225
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1324
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1289
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1290
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1291
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1292
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1293
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1294
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1298
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1333
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1364
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2077
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1377
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1460
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1491
-msgid "Cannot download metadata"
-msgstr "メタデータをダウンロードできません"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1507
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1533
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1534
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1537
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1586
-msgid "Cannot edit metadata"
-msgstr "メタデータを編集できません"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1611
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1626
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1638
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1733
-msgid "Cannot save to disk"
-msgstr "ディスクに保存できません"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1736
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1778
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1779
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1800
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1823
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1833
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1836
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1837
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1851
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1865
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1945
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2114
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2098
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2099
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2115
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2257
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2258
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "変換エラー"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -7242,15 +8161,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -7260,107 +8179,123 @@ msgstr ""
 "%d\n"
 "書籍あります"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
 "your calibre book collection directly on the device. To do this you have to "
 "turn on the content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
 msgid ""
 "Remember to leave calibre running as the server only runs as long as calibre "
 "is running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
 msgid ""
 "You have to add the URL http://myhostname:8080 as your calibre library in "
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:465
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:522
 msgid ""
 "<p>An invalid library already exists at %s, delete it before trying to move "
 "the existing library.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
@@ -7395,13 +8330,6 @@ msgstr "生産元(&M)"
 msgid "&Devices"
 msgstr "デバイス(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
 msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
@@ -7593,38 +8521,49 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "コンテンツサーバーを稼働(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
-msgstr "受信ポート(デフォルトは%default）"
-
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
-msgstr "ワーカースレッドの最大数（デフォルトは%default）"
-
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "unchecked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "checked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "empty"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
@@ -7644,14 +8583,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:262
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
 msgid ""
 "Title of generated catalog used as title in metadata.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:269
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
@@ -7660,14 +8599,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:279
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
 msgid ""
 "Regex describing tags to exclude as genres.\n"
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:285
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
 msgid ""
 "Comma-separated list of tag words indicating book should be excluded from "
 "output.  Case-insensitive.\n"
@@ -7676,28 +8615,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:293
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
 msgid ""
 "Include 'Titles' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:300
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
 msgid ""
 "Include 'Recently Added' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:307
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
 msgid ""
 "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:314
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
 "Sort titles with leading numbers as text, e.g.,\n"
 "'2001: A Space Odyssey' sorts as \n"
@@ -7706,7 +8645,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:321
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
 msgid ""
 "Specifies the output profile.  In some cases, an output profile is required "
 "to optimize the catalog for the device.  For example, 'kindle' or "
@@ -7716,27 +8655,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:328
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
 msgid ""
 "Tag indicating book has been read.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:122
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:41
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
 "List the books available in the calibre database.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:128
 msgid ""
 "The fields to display when listing books in the database. Should be a comma "
 "separated list of fields.\n"
@@ -7745,61 +8684,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:230
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:135
 msgid ""
 "The field by which to sort the results.\n"
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
 msgstr "昇順に並び替え"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:234
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:139
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:236
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:237
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
 msgstr "区切り文字(デフォルトは半角スペース）"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:238
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
 msgstr "無効なフィールド。有効なフィールド:"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
 msgstr "無効な並び替えフィールド。有効なフィールド:"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:342
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
 "The following books were not added as they already exist in the database "
 "(see --duplicates option):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:365
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:267
 msgid ""
 "%prog add [options] file1 file2 file3 ...\n"
 "\n"
@@ -7808,43 +8741,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:374
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:276
 msgid ""
 "Assume that each directory has only a single logical book and that all files "
 "in it are different e-book formats of that book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr "ディレクトリを再帰的に処理する"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:380
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:382
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid "Set the title of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:384
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:286
 msgid "Set the authors of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:386
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:288
 msgid "Set the ISBN of the added empty book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:411
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7853,11 +8786,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:442
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:461
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
 "%prog add_format [options] id ebook_file\n"
 "\n"
@@ -7866,15 +8799,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:476
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
 msgid "You must specify an id and an ebook file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:481
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:489
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:391
 msgid ""
 "\n"
 "%prog remove_format [options] id fmt\n"
@@ -7884,11 +8817,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:506
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:408
 msgid "You must specify an id and a format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7898,15 +8831,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:554
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
 msgid ""
 "\n"
 "%prog set_metadata [options] id /path/to/metadata.opf\n"
@@ -7919,11 +8852,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:570
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:472
 msgid "You must specify an id and a metadata file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -7934,27 +8867,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:598
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid "Export all books in database, ignoring the list of ids."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:600
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
 msgid "Export books to the specified directory. Default is"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:602
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:504
 msgid "Export all books into a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:609
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:511
 msgid "Specifying this switch will turn this behavior off."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:632
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:534
 msgid "You must specify some ids or the %s option"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
 msgid ""
 "%prog add_custom_column [options] label name datatype\n"
 "\n"
@@ -7965,23 +8898,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:654
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:658
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:560
 msgid ""
 "A dictionary of options to customize how the data in this column will be "
 "interpreted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:671
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
 "\n"
 "    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n"
@@ -7992,30 +8925,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:743
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
 msgid ""
 "Comma-separated list of database IDs to catalog.\n"
 "If declared, --search is ignored.\n"
 "Default: all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:747
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:649
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search-related documentation in the User Manual.\n"
 "Default: no filtering"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:753
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:655
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:766
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:786
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:688
 msgid ""
 "\n"
 "    %prog set_custom [options] column id value\n"
@@ -8027,17 +8960,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:797
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:699
 msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:808
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:710
 msgid "Error: You must specify a field name, id and value"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8046,19 +8979,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:834
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:736
 msgid "Show details for each column."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:846
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:748
 msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:854
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:756
 msgid ""
 "\n"
 "    %prog remove_custom_column [options] label\n"
@@ -8068,15 +9001,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:862
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:764
 msgid "Do not ask for confirmation"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:872
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:774
 msgid "Error: You must specify a column label"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8088,30 +9021,50 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "データベースのコンパクト化"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+msgid "Ratings"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
@@ -8234,25 +9187,106 @@ msgstr ""
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:379
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr "受信ポート(デフォルトは%default）"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
+msgid "The max number of worker threads to use. Default is %default"
+msgstr "ワーカースレッドの最大数（デフォルトは%default）"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39
+msgid ""
+"The maximum number of matches to return per OPDS query. This affects Stanza, "
+"WordPlayer, etc. integration."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:888
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
 msgid "Path to the library folder to serve with the content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:890
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
 msgid "Write process PID to the specified file"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Newest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
@@ -8267,58 +9301,62 @@ msgid ""
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:650
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:652
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:656
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:658
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:660
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
 msgstr "ユーザー・インターフェースの言語"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:662
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:682
 msgid "The default output format for ebook conversions."
 msgstr "ebook変換でのデフォルトフォーマット"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:666
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:686
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:668
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
 msgid "The priority of worker processes"
 msgstr "ワーカープロセスの優先度"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:692
 msgid "Swap author first and last names when reading metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:700
+msgid "User-created tag browser categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
 msgstr ""
@@ -8388,30 +9426,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "Spanish (Paraguay)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "German (AT)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "Dutch (NL)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+msgid "German (AT)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -8435,13 +9481,13 @@ msgstr "サーバー(%s)の認証に失敗"
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:142
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:165
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
 msgid "Untitled article"
 msgstr ""
 
@@ -8468,97 +9514,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "未知のニュースソース"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "ダウンロード完了"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "フィードの取得中"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1228
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1239
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1256
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1403
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1419
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -8579,55 +9625,55 @@ msgstr "スケジュール"
 msgid "Custom"
 msgstr "カスタム"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -8636,9 +9682,9 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
-msgstr ""
+msgstr "CSS(スタイルシート)をダウンロードしない"
 
 #~ msgid "Options to control the conversion to EPUB"
 #~ msgstr "EPUBへの変換をコントロールするためのオプション"
@@ -8898,3 +9944,24 @@ msgstr ""
 
 #~ msgid "Waiting"
 #~ msgstr "待機中"
+
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "クリックで表紙ブラウズを終了"
+
+#~ msgid "and delete from library"
+#~ msgstr "後、ライブラリから削除"
+
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "フォーマットを指定してストレージカードBに送信"
+
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "フォーマットを指定してストレージカードAに送信"
+
+#~ msgid "Send specific format to main memory"
+#~ msgstr "フォーマットを指定してメインメモリに送信"
+
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "書籍の表紙をブラウズ"
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Sony PRS-600/700/900 電子書籍リーダ─と通信します。"
diff --git a/src/calibre/translations/lv.po b/src/calibre/translations/lv.po
index 113ab6d0d3..73d9480db7 100644
--- a/src/calibre/translations/lv.po
+++ b/src/calibre/translations/lv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:39+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:28+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Latvian <ivars_a@inbox.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: LATVIA\n"
 "X-Poedit-Language: Latvian\n"
@@ -25,12 +25,12 @@ msgstr "Pilnīgi neko nedara"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -42,22 +42,22 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -103,44 +103,46 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -280,62 +282,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Šis profils ir paredzēts Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Šis profils ir paredzēts Mobipocket grāmatām"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Šis profils ir paredzēts Hanlin V3 un tā atdarinājumiem."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Šis profils ir paredzēts Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Šis profils ir paredzēts Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Šis profils ir paredzēts Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Šis profils ir paredzēts Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Šis profils ir paredzēts IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
@@ -359,21 +361,21 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Šis profils ir paredzēts Amazon Kindle DX."
 
@@ -393,15 +395,19 @@ msgstr ""
 msgid "Disabled plugins"
 msgstr "Atspējotie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -409,29 +415,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Pievienot spraudni, norādot zip failu, kurš to satur."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -445,59 +451,70 @@ msgid ""
 "first one that exists will be used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Ziņas"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -520,6 +537,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Komunicē arEB600 e-grāmatu lasītāju"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -532,6 +553,10 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Komunicē arESlick e-grāmatu lasītāju."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -546,14 +571,20 @@ msgstr "Ierīču saskarnes"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
@@ -580,7 +611,7 @@ msgstr "Komunicē arIRex Iliad e-grāmatu lasītāju."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -600,15 +631,15 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Komunicē ar JetBook e-grāmatu lasītāju."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Komunicē ar Kindle e-grāmatu lasītāju."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Komunicē ar Kindle 2 e-grāmatu lasītāju."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
@@ -652,13 +683,13 @@ msgstr "Komunicē ar Sony PRS-500 e-grāmatu lasītāju."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -679,61 +710,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Ziņas"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Ierīces uzstādījumi"
@@ -743,57 +763,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Dzēš grāmatas no ierīces..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Sūta ierīcei grāmatu metadatus..."
 
@@ -1386,15 +1410,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1702,84 +1726,88 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Nosaukums"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autors(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Komentāri"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Birkas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Sērija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Valoda"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publicēts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr ""
 
@@ -1787,7 +1815,7 @@ msgstr ""
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1886,6 +1914,10 @@ msgstr "Vāks saglabāts"
 msgid "No cover found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1924,6 +1956,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1980,7 +2016,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Vāks"
@@ -2266,6 +2302,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autors"
 
@@ -2473,7 +2511,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2550,23 +2588,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Nokopēts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopēt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Kopēt uz starpliktuvi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Komiki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Arhīvi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Nav izvēlēta grāmata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Nav iespējams lejupielādēt metadatus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "vāki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Nav iespējams lejupielādēt daļu metadatu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Nevarēja lejuplādēt metadatus:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Nevar lejuplādēt metadatus:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Kļūda"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Nav iespējams rediģēt metadatus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Nav iespējams saglabāt diskā"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Kļūda saglabājot"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Dažas grāmatas nevarēja saglabāt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Nav iespējams pārveidot"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Izvēlētas vairākas grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
@@ -2588,15 +3019,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Pievienots"
@@ -2715,17 +3141,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2744,17 +3170,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2776,6 +3202,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Atrodas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formāti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Nav"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2835,7 +3313,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2853,8 +3331,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3535,11 +4013,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3620,12 +4093,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3835,11 +4308,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Pārlūkot vākus"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3860,278 +4341,290 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Sūtīt uz pamatatmiņu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Sūtīt uz karti A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Sūtīt uz karti B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Ierīce: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-grāmata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Atrodas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formāti"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4279,165 +4772,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Kļūda"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s nav derīga spraudņu atrašanās vieta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Izvēlieties spraudni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Spraudni nevar atspējot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Spraudni %s nevar atspējot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Spraudnis nav pielāgojams"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Spraudnim %s nav nepieciešama pielāgošana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Vai esat pārliecināts?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Kļūdu žurnāls:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4548,13 +5041,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4562,267 +5056,275 @@ msgstr ""
 "Grāmatu &glabāšanas vieta (E-grāmatas tiek glabātas autoriem atbilstošos "
 "katalogos. Metadati tiek glabāti failā metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Izvēlēties jaunu datubāzes atrašanās vietu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Informēt, kad pieejama &jauna versija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekundes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Izvēlieties va&lodu (nepieciešams pārstartēt):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Standarta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Augsta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Zema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "Darbu &prioritāte:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Vēlamais &rezultāta formāts:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Rīkjosla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Liela"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Vidēja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Maza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4833,33 +5335,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4896,10 +5398,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datums"
 
@@ -4915,68 +5418,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5085,6 +5589,27 @@ msgstr ""
 msgid "ERROR"
 msgstr "KĻŪDA"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Autors kārtošanai"
@@ -5300,11 +5825,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr "Izvēlieties formātus "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Grāmatas"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5343,67 +5863,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Lejupielādē vāku..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Lejupielādes noildze."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "Šai grāmatai nevar atrast vāku. Mēģiniet norādīt ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Slikts vāks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5760,12 +6288,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autori"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr ""
 
@@ -5878,12 +6406,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5915,25 +6443,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6175,11 +6703,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6215,54 +6743,209 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Rediģēt metadatus grāmatai"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Rediģēt metadatus masveidā"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Lejupielādēt metadatus un vākus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Lejupielādēt tikai metadatus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Lejupielādēt tikai vākus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Pievienot vienā katalogā esošas grāmatas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Pievienot grāmatas no vairākiem katalogiem, ieskaitot apakškatalogus "
+"(Katalogā viena grāmata, katrs e-grāmatu fails tiek uzskatītas par vienu un "
+"to pašu grāmatu dažādos formātos)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Pievienot grāmatas no vairākiem katalogiem, ieskaitot apakškatalogus "
+"(Vairākas grāmatas katalogā, atsevišķi e-grāmatu faili tiek uzskatīti par "
+"dažādām grāmatām)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Pievienot tukšu grāmatu. (Grāmatas ierakstu bez formātiem)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Saglabāt diskā"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Skatīt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Masveida pārveidošana"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Līdzīgas grāmatas..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Statuss"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progress"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Darbi:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6274,112 +6957,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Izmērs (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Vērtējums"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Nav"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "<font face=\"serif\">%s</font>. no %s grāmatām."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6475,282 +7136,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr "Nemeklēt atjauninājumus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Paplašinātā meklēšana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Meklēt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Kārtot pēc &popularitātes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Pievienot grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Dzēst grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Rediģēt metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Sūtīt uz ierīci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Saglabāt diskā"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Pārveidot e-grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Skatīt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Atvērt katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Parādīt grāmatas detaļas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Šī paša autora grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Šīs sērijas grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Grāmatas ar tādām pašām birkām"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6780,15 +7412,35 @@ msgstr "Grāmatai nav ne nosaukuma ne ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Meklēt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Meklēt (paplašinātai meklēšanai nospiediet pogu kreisajā pusē)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6849,82 +7501,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Darbi:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -6966,625 +7611,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Meklēt (paplašinātai meklēšanai nospiediet pogu kreisajā pusē)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Rediģēt metadatus grāmatai"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Rediģēt metadatus masveidā"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Lejupielādēt metadatus un vākus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Lejupielādēt tikai metadatus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Lejupielādēt tikai vākus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Pievienot vienā katalogā esošas grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Pievienot grāmatas no vairākiem katalogiem, ieskaitot apakškatalogus "
-"(Katalogā viena grāmata, katrs e-grāmatu fails tiek uzskatītas par vienu un "
-"to pašu grāmatu dažādos formātos)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Pievienot grāmatas no vairākiem katalogiem, ieskaitot apakškatalogus "
-"(Vairākas grāmatas katalogā, atsevišķi e-grāmatu faili tiek uzskatīti par "
-"dažādām grāmatām)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Pievienot tukšu grāmatu. (Grāmatas ierakstu bez formātiem)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Masveida pārveidošana"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Līdzīgas grāmatas..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Pārlūkot vākus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Ierīce: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Komiki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Arhīvi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Nav izvēlēta grāmata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Nav iespējams lejupielādēt metadatus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "vāki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metadati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Nav iespējams lejupielādēt daļu metadatu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Nevarēja lejuplādēt metadatus:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Nevar lejuplādēt metadatus:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Nav iespējams rediģēt metadatus"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Nav iespējams saglabāt diskā"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Kļūda saglabājot"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Dažas grāmatas nevarēja saglabāt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Nav iespējams pārveidot"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Izvēlētas vairākas grāmatas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Pieejams atjauninājums"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8051,15 +8183,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8069,67 +8201,79 @@ msgstr ""
 "%d\n"
 "grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8390,48 +8534,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8809,7 +8953,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8890,43 +9034,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Kopē <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9112,43 +9260,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9291,34 +9439,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9375,97 +9527,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Lejupielāde pabeigta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " no "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Mēģina lejupielādēt vāku..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Lejupielādē vāku no %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9486,55 +9638,55 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9543,7 +9695,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -9553,6 +9705,9 @@ msgstr ""
 #~ msgid "Kovid Goyal and John Schember"
 #~ msgstr "Kovid Goyal un John Schember"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Kārtot pēc &popularitātes"
+
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "Šis profils ir paredzēts SONY PRS sērijai. 500/505/700 u.c."
 
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 346c693313..9e213b359b 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:36+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:12+0000\n"
 "Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -295,63 +297,63 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Ten profil przeznaczony jest dla programu Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Ten profil przeznaczony jest dla urządzeń Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Ten profil przeznaczony jest dla urządzenia Hanlin V3 i jego klonów."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Ten profil przeznaczony jest dla urządzenia Hanlin V5 i jego klonów."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Ten profil przeznaczony jest dla urządzenia Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Ten profil przeznaczony jest dla urządzenia Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Ten profil przeznaczony jest dla urządzenia Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Ten profil przeznaczony jest dla urządzenia Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 "Ten profil przeznaczony jest dla urządzenia IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Ten profil przeznaczony jest dla urządzenia IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ten profil przeznaczony jest dla urządzenia B&N Nook."
 
@@ -378,15 +380,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Ten profil przeznaczony jest dla urządzenia Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Ten profil przeznaczony jest dla 5 calowego urządzenia JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -394,7 +396,7 @@ msgstr ""
 "Ten profil przeznaczony jest dla urządzeń z linii SONY PRS w trybie "
 "panoramicznym. Np. 500/505/700 itd. Głównie użyteczny przy komiksach."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ten profil przeznaczony jest dla urządzenia Amazon Kindle DX."
 
@@ -414,15 +416,19 @@ msgstr "Lokalne dostosowanie wtyczek"
 msgid "Disabled plugins"
 msgstr "Wyłączone wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Nie znaleziono wtyczki w "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicjacja wtyczki %s nie udała się - prześledź komunikaty:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -434,16 +440,16 @@ msgstr ""
 "    Spersonalizuj calibre poprzez załadowanie zewnętrznych wtyczek\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Dodaj wtyczkę przez podanie ścieżki do pliku, który ją zawiera."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Usuń wtyczkę użytkownika - po nazwie. Nie ma wpływu na wtyczki wbudowane."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -451,15 +457,15 @@ msgstr ""
 "Dostosuj wtyczkę. Wprowadź nazwę wtyczki i polecenie dostosowujące "
 "oddzielając przecinkami."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Wyświetl wszystkie zainstalowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Włącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Wyłącz wtyczkę"
 
@@ -475,59 +481,70 @@ msgstr ""
 "Oddzielonych przecinkami listę katalogów, aby wysłać e-książek w urządzeniu. "
 "Pierwszy z nich, że istnieje zostaną wykorzystane"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Umożliwia komunikację z telefonami S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "ustawienia dla sterowników urządzeń"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Uporządkowana lista formatów akceptowanych przez urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Aktualności"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Binatone Readme."
@@ -550,6 +567,10 @@ msgstr "Umożliwia komunikację z czytnikiem Cybook Gen 3 / Opus."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek EB600."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -562,6 +583,10 @@ msgstr "Umożliwia komunikację z czytnikiem Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek ESlick."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -576,14 +601,20 @@ msgstr "Interfejs urządzenia"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Umożliwia komunikację z czytnikiem książek Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Umożliwia komunikację z czytnikiem książek Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Hanvon N520."
@@ -610,7 +641,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -630,15 +661,15 @@ msgstr "Umożliwia komunikację z czytnikiem książek Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle DX."
 
@@ -682,7 +713,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -690,7 +721,7 @@ msgstr ""
 "Lista oddzielonych przecinkami pól metadanych do włączenia do zbiorów w "
 "urządzeniu. Możliwości obejmują: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Nienazwany"
@@ -711,23 +742,23 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Wykrycie dysku %s niemożliwe. Spróbuj ponownie uruchomić komputer."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "Nie można wykryć %s punkt montowania. Spróbuj zrestartować system."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Nie można wykryć %s dysku."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Nie można znaleźć pomocnika montowania: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -735,39 +766,28 @@ msgstr ""
 "Nie można wykryć %s dysku. Jądro jest prawdopodobnie eksportujących "
 "przestarzała wersja SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Nie można zamontować pamięci głównej (Kod błędu: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Brak pamięci na karcie urządzenia w tym wejściu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Wybrane gniazda: %s nie jest obsługiwany."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Niewystarczająca ilość wolnej pamięci głównej"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Na karcie pamięci jest niewystarczająca ilość wolnego miejsca"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Aktualności"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Konfiguruj urządzenie"
@@ -777,57 +797,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Umieszczaj pliki w podfolderach, jeśli urządzenie wpiera ich obsługę"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Odczytaj dane meta z książek na urządzeniu"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Szablon do kontrolowania sposobu, w jaki książki są zapisywane"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Dodatkowa personalizacja"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Pobierz informacje o urządzeniu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Pobieranie listy książek znajdujących się na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Przenoszenie książek na urządzenie..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Dodanie książki do urządzenia metadanych lista..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Usuwanie książek z urządzenia..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Usuwanie książki z urządzenia metadanych lista"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Przesyłanie danych meta do urządzenia..."
 
@@ -1484,15 +1508,15 @@ msgstr "Wartości indeksu serii i oceny muszą być cyframi. Ignoruję"
 msgid "Failed to parse date/time"
 msgstr "Nie udało się porzetworzyć daty/czasu"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Konwertuję plik źródłowy na plik HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Wykonywanie przekształceń na książce..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Tworzenie"
 
@@ -1830,84 +1854,88 @@ msgstr "Rodzina czcionek o stałej szerokości do umieszczenia"
 msgid "Comic"
 msgstr "Komiks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tytuł"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(rzy)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Komentarze"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etykiety"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Język"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Opublikowana"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Uprawnienia"
 
@@ -1915,7 +1943,7 @@ msgstr "Uprawnienia"
 msgid "EDITORIAL REVIEW"
 msgstr "PRZEGLĄD REDAKCYJNY"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2018,6 +2046,10 @@ msgstr "Okładka zapisana do"
 msgid "No cover found"
 msgstr "Nie znaleziono okładki"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Pobieranie metadanych"
@@ -2058,6 +2090,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Pobierz metadane społecznościowe z amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2118,7 +2154,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Okładka"
@@ -2410,6 +2446,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2628,8 +2666,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Używaj numeracji rzymskiej do numerowania serii"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Sortuj etykiety według popularności"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2708,23 +2746,420 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Skopiowano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Kopiuj do schowka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Wybiesz pliki"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Użyj tylko biblioteki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "Użyj tylko adnotacji wygenerowanych na podstawie biblioteki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Nie wybrano ksiązek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Ostatnio czytana strona: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Ostatnio czytana strona: Lokalizacja %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Lokalizacja %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Strona %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Lokalizacja %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "Jak wiele pustych książek?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "Jak wiele pustych książek powinno zostać dodanych?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Przesyłam książki na urządzenie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "Książki EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "Książki LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "Książki HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "Książki LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "Książki MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Książki tekstowe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "Książki PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Komiksy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Archiwa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Wspierane książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Scal niektóre książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Nie można było odczytać metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Nie można było odczytać metadanych z nastepujących"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Nie wybrano ksiązki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "Usunięcie niemożliwe."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Wybierz formaty do usunięcia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Wybierz formaty, które <b>nie</b> zostaną usunięte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Usuwanie książek z urządzenia."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Wybrane książki będą <b>permanentnie usunięte</b> i ich pliki zostaną "
+"usunięte z twojego komputera. Jesteś pewny?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Nie można obrac metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "metadane społecznościowe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "okładki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Pobieram %s dla %d książki(ek)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Nie udało się pobrać niektórych metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Nie udało się pobrać metadanych dla następujących e-ksiązek:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Nie udało się pobrać metadanych:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Błąd"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Nie można edytować metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Nie można połączyć książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Conajmniej dwie książki muszą zostać wybrane, aby móc je połączyć"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Chcesz połączyć więcej niż 5 książek. Jesteś <b>pewien</b>, że chcesz "
+"kontynuować?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Nie można zapisać na dysku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Wyberz folder docelowy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Błąd podczas zapisywania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Wysapił błąd podczas zapisywania."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Nie można była zapisać niektórych książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Kliknij \"Pokaż szczegóły\", aby zobaczyć które."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Brak książek do wygenerowania katalogu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Generowanie katalogu %s..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Nie znaleziono książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Katalog wygenerowany"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Eksportuj folder katalogu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Wybierz folder docelowy dla %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Pobieranie aktualności z "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " - pobrano."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Nie można przekonwertować"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Rozpoczynam konwersję %d książki(ek)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Nie można wyświetlić"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Wybierz format do wyświetlenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Wybrano wiele książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Nie można otworzyć folderu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s nie ma dostępnych formatów."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Szukam w"
@@ -2746,15 +3181,10 @@ msgid "The specified directory could not be processed."
 msgstr "Wybrany folder nie może byc przetworzony."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Brak książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Nie znaleziono książek"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Dodano"
@@ -2873,17 +3303,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2902,17 +3332,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2934,6 +3364,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Ścieżka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formaty"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Brak"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "Opcje CVS/XML"
@@ -2993,7 +3475,7 @@ msgstr "wyjście"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3011,8 +3493,8 @@ msgstr "Opcje książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3692,11 +4174,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "Wyjściowy RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Wybierz format do wyświetlenia"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3780,12 +4257,12 @@ msgid "Footer regular expression:"
 msgstr "Wyrażenie regularne dla stopki:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Niewłaściwe wyrażenie regularne: %s"
 
@@ -3995,11 +4472,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Przeglądaj po okładkach"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4020,286 +4505,300 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Brak szczegółów."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "Urządzenie zostało już odłączone."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Pobierz informacje o urządzeniach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Pozyskaj listę książek na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Pobierz adnotacje  z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Prześlij metadane do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Prześlij %d książek na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Usuń książki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Pobierz książki z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Zobacz ksiązki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Ustaw domyślne działanie przesyłania na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "Prześlij emailem do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Prześlij do głównej pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Prześlij na kartę pamięci A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Prześlij na kartę pamięci B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Błąd podczas komunikacji z urządzeniem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Błąd komunikacji z urządzeniem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Wystąpił chwilowy błąd komunikacji z urządzeniem. Odłącz i podłącz je "
+"ponownie lub uruchom komputer ponownie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Urządzenie: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " wykryte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Połączone "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "wybranych do wysłania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Wybierz format plików przesyłanych na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Brak urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Nie można było przesłać: Żadne urządenie nie jest podłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Brak karty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Nie można przesłać: Urządzenie nie posiada karty pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "przez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "w formacie %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Wysyłanie wiadomości do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Brak odpowiednich formatów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed wysłaniem ich "
 "poprzez email?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nie można było przesłać następujących książek poprzez email, ponieważ nie "
 "znaleziono odpowiednich formatów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Przesłanie książek na email nie powiodło się"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Przesłanie następujących książek poprzez email nie powiodło się:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Preślij poprzez email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Aktualności:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Załączony jest"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Wysyłaj aktualności do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed przesłaniem ich "
 "na urządzenie?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Trwa wysyłanie katalogów do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Przesyłanie aktualności na urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Wysyłanie książek do urządzenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Brak miejsca na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p> Nie można umieścić książek na urządzeniu z powodu braku wolnego miejsca "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "Wybierz dostepne formaty i ich porządek dla tego urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Uzywaj podkatalogów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "&Zapisz schemat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Ścieżka"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formaty"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "Dopasuj &okładkę do rozmiaru okna"
@@ -4449,171 +4948,171 @@ msgstr ""
 msgid "new email address"
 msgstr "nowy adres email"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Błąd"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "Nie powiodła się instalacja narzędzi linii poleceń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "Narzędzia linii poleceń zostały zainstalowane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "Narzędzia linii poleceń zostały zainstalowane w"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Jeśli przeniesiesz calibre.app, będziesz musiał przeinstalować narzędzia "
 "linii poleceń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "Niewłaściwa ścieżka do wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s nie jest właściwą ścieżką do wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Wybierz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Wtyczka nie może zostać wyłączona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Wtyczka %s nie może zostać wyłączona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Tej wtyczki nie można dostosowywać"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Wtyczka %s nie potrzebuje dodatkowego dostosowywania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Nie można usunąć wbudowanej wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " - ta wtyczka nie może zostać usunięta. Ta wtyczka jest wbudowana w program. "
 "Zamiast tego spróbuj ją wyłączyć."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Na pewno?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Dziennik błędów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Dziennik dostępów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Włączanie serwera zakończone niepowodzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Wybierz lokalizację dla książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Niewłaściwy rozmiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "Rozmiar %s jest nieprawidłowy. Musi on byc podany w fromacie "
 "wysokośćxszerokość"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Niewłaściwa lokalizacja bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Niewłaściwa lokalizacja bazy danych "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Musi być katalogiem."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Niewłaściwa lokalizacja bazy danych.<br>Nie można zapisać do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Sprawdzanie integralności bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "Sprawdzenie integralności bazy danych się nie powiodło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4727,13 +5226,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Przesyłanie na &urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4741,196 +5241,204 @@ msgstr ""
 "&Lokalizacja książek (Książki są przechowywane w folderach posortowanych "
 "według autorów a metadane znajdują się w pliku metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Wybierz nową lokalizację bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Pokaż powiadomienie, gdy &nowa wersja jest dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Pobieraj domyślnie metadane &społecznościowe (etykiety/oceny/itd.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "Domyślnie &nadpisuj autora i tytuł przy pobieraniu metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "Domyślny sieciowy &czas oczekiwania:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Wybierz &język (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normalny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Wysoki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Niski"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Priorytet zdań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Preferowany format &docelowy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Preferowany porządek formatów &źródłowych:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Używaj numeracji &rzymskiej do numerowania serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Aktywuj ikonę w &zasobniku systemowym (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Pokaż &powiadomienia w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Pokaż &przeglądarkę okładek w nowym oknie (wymaga restartu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Szukaj w trakcie wpisywania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automatycznie przesyłaj pobrane &aktualności na czytnik e-książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Usuń wiadomości z biblioteki, gdy jest automatycznie wysyłane do czytnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Liczba wyświetlanych okładek w trybie przeglądarki (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&Rozmiar przycisków na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Pokazuj &tekst pod przyciskami na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Wybierz &kolumny wyświetlane w widoku biblioteki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Użyj &wewnętrzej przeglądarki dla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Dodaj adres email, na którego chcesz wysłać ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "&Dodaj email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "&Ustaw jako domyślny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "&Usuń email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "&Sprawdź integralność bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "Za&instaluj narzędzia linii komend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "Otwórz katalog &konfiguracyjny calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Ogranicz liczbę jednocześnie wykonywanych zadań do ilości &rdzeni procesora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -4940,25 +5448,25 @@ msgstr ""
 "pomocą przeglądarki z dowolnego miejsca na świecie. Jakiekolwiek zmiany w "
 "ustawieniach zostaną zatwierdzone po ponownym uruchomieniu serwera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Port serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nazwa &użytkownika:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Hasło:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -4966,51 +5474,51 @@ msgstr ""
 "Jeśli pozostawisz pole hasła puste, każdy będzie mógł uzyskać dostęp do "
 "twojej kolekcji książek przez interfejs internetowy."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Maks. rozmiar &okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Pokaż hasło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Włącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "W&yłącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Testuj serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "Uruchom serwer &automatycznie przy starcie aplikacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Pokaż dziennik &serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5027,7 +5535,7 @@ msgstr ""
 "na urządzeniu iPhone. Oto myhostname powinny być w pełni kwalifikowaną nazwę "
 "hosta lub adres IP klasy komputer jest zasilany."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5035,27 +5543,27 @@ msgstr ""
 "Tutaj można dostosować zachowanie Calibre poprzez kontrolę wtyczek, których "
 "ma używać."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Włącz/&Wyłącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Dostosuj wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Usuń wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Dodaj nową wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Plik wtyczki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -5092,10 +5600,11 @@ msgid "Number"
 msgstr "Liczba"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
 
@@ -5111,68 +5620,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5281,6 +5791,27 @@ msgstr "&Zawsze pokazuj to ostrzeżenie"
 msgid "ERROR"
 msgstr "BŁĄD"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5497,11 +6028,6 @@ msgstr "To nie jest działający obrazek"
 msgid "Choose formats for "
 msgstr "Wybierz formaty dla "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Książki"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Brak uprawnień"
@@ -5540,71 +6066,79 @@ msgstr "Okładka w formacie %s jest nieprawidłowa"
 msgid "Abort the editing of all remaining books"
 msgstr "Przerwij edycję wszystkich pozostałych książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Numer ISBN jest poprawny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Numer ISBN nie jest poprawny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Pobieranie okładki..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Nie można pobrać okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Nie można pobrać okładki.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Czas pobierania minął."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "Nie udało się odnaleźć okładki dla tej książki. Spróbuj podać najpierw numer "
 "ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Zła okładka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Ta okładka nie jest działającym obrazkiem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Pojawiły się błędy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "Wystepiły błędy podczas pobierania społecznościowych metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Nie można pobrać metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "Musisz określić co najmniej jeden element - kod ISBN, tytuł, autor lub "
 "wydawca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Brak dostępu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 "Nie można otworzyć %s. Czy ten plik nie jest przypadkiem używany przez inny "
@@ -5978,12 +6512,12 @@ msgid "Choose formats"
 msgstr "Wybierz formaty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autorzy"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -6100,12 +6634,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "Dodaj etykietę do dostępnych etykiet i przypisz ją do tej książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6137,25 +6671,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6400,11 +6934,11 @@ msgstr "Wyrażenie regularne (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Brak wyników"
 
@@ -6440,54 +6974,207 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Wyrażenie regularne (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Zapisz w pojedynczym formacie na dysku..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Edytuj metadane pojedynczo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Edytuj metadane masowo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Pobierz metadane i okładki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Pobierz tylko metadane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Pobierz tylko okładki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Pobierz tylko metadane społecznościowe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Połącz do pierwszej wybranej książki - pozostałe usuń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Połącz do pierwszej wybranej książki - pozostałe pozostaw"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Dodaj książki z pojedyńczego folderu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Dodaj książki z folderów, włączając w to podfoldery (Jedna książka na "
+"folder, zakładając, że każdy plik jest tą samą książką w innym formacie)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Dodaj książki z folderów, włączając w to podfoldery (Wiele książek na "
+"folder, zakładając, że każdy plik jest inną książką)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Dodaj pustą książkę (Wpis książki bez formatów)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Zapisz na dysku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Zapisz na dysku w pojedyńczym folderze"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Zapisz na dysku jedynie pliki w formacie %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Wyświetl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Wyświetl określony format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Usuń wybrane książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Usuń pliki określonego formatu z wybranych książek..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Usuń wszystkie formaty z wybranych książek oprócz..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Usuń okładki z wybranych książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Konwertuj pojedynczo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Masowa konwersja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Stwórz katalog książek w Twojej bibliotece calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Uruchom kreator wstępnych ustawień"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Podobne książki..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Zadanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Postęp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Czas pracy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Aktualnie jest przetwarzanych %d zadań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Nieznane zadanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Aktualnie jest %d zadań oczekujących:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Nie można zatrzymać zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Nie można przerwać zadania, które komunikuje się z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Zadanie zostało już wykonane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Niedostępne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Zadań:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Kliknij, aby zobaczyć listę aktywnych zadań."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Zadania"
 
@@ -6499,112 +7186,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Rozmiar (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Brak"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Książka <font face=\"serif\">%s</font> z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknij dwa razy, aby rozpocząć <b>edycję</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Niedozwolone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6700,284 +7365,255 @@ msgstr "Zapisuj informacje z debugowania do konsoli"
 msgid "Do not check for updates"
 msgstr "Nie sprawdzaj czy uaktualnienie jest dostępne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Biblioteka calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Zła lokalizacja bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Jeśli jestes pewien, że nie jest uruchomione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Nie można uruchomić "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s jest już uruchomiony."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "może być uruchomione i znajdować się w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "w prawym górnym obszarze wyświetlacza."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "w prawym donym obszarze wyświetlacza."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "spróbuj zrestartować komputer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "spróbuj usunąć plik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "usraw w ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Szukaj:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Wyczyść pasek wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 "Wybierz zapisane wyszukiwanie lub wpisz nazwę dla nowego wyszukiwania do "
 "zapisu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Usuń aktualne, zapisane wyszukiwanie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Sortuj według &popularności"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Dopasuj którykolwiek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Dopasuj wszystkie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Dodaj książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Usuń książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Usuń"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Prześlij na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Zapisz na dysku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Pobierz aktualności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Konwertuj ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Wyświetl"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Otwórz folder zawierający"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Pokaż szczegóły ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Książki tego samego autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Książki z tej serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Książki tego samego wydawcy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Książki z takimi samymi etykietami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Konfiguruj calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7007,15 +7643,36 @@ msgstr "Książka nie ma, ani tytułu, ani kodu ISBN"
 msgid "No matches found for this book"
 msgstr "Nie znaleziono wyników dla tej książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Szukaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+"Szukaj (Aby użyć zaawansowanego wyszukiwania kliknij przycisk po lewej)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Zachowane wyszukiwania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(wszystkie książki)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Wciśnij dowolny klawisz..."
@@ -7076,82 +7733,75 @@ msgstr "Wyczyść"
 msgid "&Alternate shortcut:"
 msgstr "&Alternatywny skrót:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Zadań:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Kliknij, aby zobaczyć listę aktywnych zadań."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Dopasuj wszystkie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Dopasuj którykolwiek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7197,581 +7847,63 @@ msgstr ""
 "Następujące książki zostały już skonwertowane do formatu %s. Czy chcesz, by "
 "zostały ponownie skonwertowane?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Zapisz w pojedynczym formacie na dysku..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-"Szukaj (Aby użyć zaawansowanego wyszukiwania kliknij przycisk po lewej)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Zachowane wyszukiwania"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Błąd podczas komunikacji z urządzeniem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Przywróć"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "&Wpłać i wesprzyj rozwój calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "&Odłącz połączone urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Uruchom ponownie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Aby uzyskać pomoc otwórz: <a href=\"%s\">Podręcznik Uzytkownika</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s stworzył <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Edytuj metadane pojedynczo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Edytuj metadane masowo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Pobierz metadane i okładki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Pobierz tylko metadane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Pobierz tylko okładki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Pobierz tylko metadane społecznościowe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Połącz do pierwszej wybranej książki - pozostałe usuń"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Połącz do pierwszej wybranej książki - pozostałe pozostaw"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Dodaj książki z pojedyńczego folderu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Dodaj książki z folderów, włączając w to podfoldery (Jedna książka na "
-"folder, zakładając, że każdy plik jest tą samą książką w innym formacie)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Dodaj książki z folderów, włączając w to podfoldery (Wiele książek na "
-"folder, zakładając, że każdy plik jest inną książką)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Dodaj pustą książkę (Wpis książki bez formatów)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Zapisz na dysku w pojedyńczym folderze"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Zapisz na dysku jedynie pliki w formacie %s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Wyświetl określony format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Usuń wybrane książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Usuń pliki określonego formatu z wybranych książek..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Usuń wszystkie formaty z wybranych książek oprócz..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Usuń okładki z wybranych książek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Konwertuj pojedynczo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Masowa konwersja"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Stwórz katalog książek w Twojej bibliotece calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Uruchom kreator wstępnych ustawień"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Podobne książki..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Krótki przewodnik po calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Przeglądaj po okładkach"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(wszystkie książki)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Urządzenie: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " wykryte"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Połączone "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Baza danych urządzenia uszkodzona"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Użyj tylko biblioteki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "Użyj tylko adnotacji wygenerowanych na podstawie biblioteki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Nie wybrano ksiązek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Ostatnio czytana strona: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Ostatnio czytana strona: Lokalizacja %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Lokalizacja %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Strona %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Lokalizacja %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "Jak wiele pustych książek?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "Jak wiele pustych książek powinno zostać dodanych?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Przesyłam książki na urządzenie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "Książki EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "Książki LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "Książki HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "Książki LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "Książki MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Książki tekstowe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "Książki PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Komiksy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Archiwa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "Wspierane książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "Scal niektóre książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Nie można było odczytać metadanych"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Nie można było odczytać metadanych z nastepujących"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "Usunięcie niemożliwe."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Nie wybrano ksiązki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "Wybierz formaty do usunięcia"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "Wybierz formaty, które <b>nie</b> zostaną usunięte"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Wybrane książki będą <b>permanentnie usunięte</b> i ich pliki zostaną "
-"usunięte z twojego komputera. Jesteś pewny?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Usuwanie książek z urządzenia."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Nie można obrac metadanych"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "metadane społecznościowe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "okładki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metadane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Pobieram %s dla %d książki(ek)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Nie udało się pobrać niektórych metadanych"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Nie udało się pobrać metadanych dla następujących e-ksiązek:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Nie udało się pobrać metadanych:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Nie można edytować metadanych"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "Nie można połączyć książek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Conajmniej dwie książki muszą zostać wybrane, aby móc je połączyć"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Chcesz połączyć więcej niż 5 książek. Jesteś <b>pewien</b>, że chcesz "
-"kontynuować?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Nie można zapisać na dysku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Wyberz folder docelowy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Błąd podczas zapisywania"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Wysapił błąd podczas zapisywania."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Nie można była zapisać niektórych książek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "Kliknij \"Pokaż szczegóły\", aby zobaczyć które."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "Brak książek do wygenerowania katalogu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Generowanie katalogu %s..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Katalog wygenerowany"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "Eksportuj folder katalogu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "Wybierz folder docelowy dla %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Pobieranie aktualności z "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " - pobrano."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Nie można przekonwertować"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "Rozpoczynam konwersję %d książki(ek)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Nie można wyświetlić"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Wybrano wiele książek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Nie można otworzyć folderu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s nie ma dostępnych formatów."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Nie można konfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można konfigurować programu, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Brak szczegółowych informacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "Brak szczegółowych informacji dla książek na urządzeniu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Błąd komunikacji z urządzeniem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Wystąpił chwilowy błąd komunikacji z urządzeniem. Odłącz i podłącz je "
-"ponownie lub uruchom komputer ponownie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -7780,26 +7912,26 @@ msgstr ""
 "href=\"%s\">DRM</a>. Musisz najpierw usunąć to zabezpieczenie przy pomocy "
 "innego programu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Źródło wyłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Nie powiodło się</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Niektóre zadania są aktywne. Jesteś pewnien, że chcesz zamknąć program?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7809,11 +7941,11 @@ msgstr ""
 "                      Wyjście może spowodować uszkodzenie urządzenia.<br>\n"
 "                      Jesteś pewny, że chcesz wyjść?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "OSTRZEŻENIE: Aktywne zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -7821,7 +7953,7 @@ msgstr ""
 "będzie uruchomione w zasobniku systemowym. Aby je zamknąć, wybierz "
 "<b>Zakończ</b> z menu kontekstowego w zasobniku systemowym."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7829,11 +7961,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Najnowsza wersja: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Uaktualnienia dostępne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8307,15 +8439,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Wydrukuj e-książkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Kopiuj grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Wklej grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8325,7 +8457,7 @@ msgstr ""
 "%d\n"
 "książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8335,7 +8467,7 @@ msgstr ""
 "%s\n"
 "dostępny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8345,7 +8477,7 @@ msgstr ""
 "%s\n"
 "dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8355,46 +8487,58 @@ msgstr ""
 "%s\n"
 "dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr "Kliknij, aby zobaczyć książki na głównej pamięci twojego czytnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr "Kliknij, aby zobaczyć książki na karcie pamięci A w twoim czytniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr "Kliknij, aby zobaczyć książki na karcie pamięci B w twoim czytniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Zmień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Wielkie litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Małe litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Zamień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Wielkość liter w tytule"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8670,48 +8814,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Włącz serwer &zawartości"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -9093,7 +9237,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 "Pokazuj szczegółowową informację wyjściową. Przydatne przy debugowaniu."
@@ -9175,43 +9319,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Kopiowanie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Kompaktowanie bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "Sprawdzam integralność SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "Sprawdzam czy brakuje jakichś plików."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9413,43 +9561,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr "Zapisz identyfikator procesu do określonego pliku"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9593,34 +9741,38 @@ msgid "English (Pakistan)"
 msgstr "Angielski (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Angielski (Singapur)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "angielski (Jemen)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "angielski (Irlandia)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "hiszpański (Paragwaj)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Niemiecki (Austria)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Niderlandzki (Holandia)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Niderlandzi (Belgia)"
 
@@ -9680,97 +9832,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Nieznane źródło informacji"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Źródło \"%s\" wymaga podania nazwy użytkownika i hasła."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Pobranie zakończone"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Nie udało się pobrać następujących artykułów:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Nie udało się pobrać części następujących artykułów:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " z "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tNieprawidłowe linki:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Nie udało się pobrać artykułu. Użyj -vv, by zobaczyć przyczynę"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Pobieram strumienie..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Pobierz strumienie ze strony głównej"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Próbuję pobrać okładkę..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Rozpoczynam pobieranie [%d wątek(ków)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Strumienie pobrano do %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Nie można pobrać okładki: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Pobieranie okładki z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Artykuł bez tytułu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Artykuł pobrany: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Pobieranie artykułu nie powiodło się: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Pobieram strumień"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9791,7 +9943,7 @@ msgstr "Zaplanowano"
 msgid "Custom"
 msgstr "Dostosuj"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9801,24 +9953,24 @@ msgstr ""
 "\n"
 "Gdzie URL to na przykład http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Główny katalog, w którym zapisywane są adresy URL. Domyślnie to %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "Czas oczekiwania na odpowiedź serwera. Domyślnie: %default sek."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9826,7 +9978,7 @@ msgstr ""
 "Maksymalna liczba plików do pobrania. Stosowane jedynie do plików z etykiet "
 "<a href>. Wartość domyślna: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -9834,7 +9986,7 @@ msgstr ""
 "Minimalny odstęp w sekundach pomiędzy kolejnymi pobraniami. Domyślnie to "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9842,14 +9994,14 @@ msgstr ""
 "Kodowanie znaków stron internetowych, które próbujesz pobrać. Domyślnie "
 "calibre stara się automatycznie wybrać odpowiednie kodowanie."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9858,7 +10010,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Nie pobieraj arkuszy styli CSS."
 
@@ -10256,6 +10408,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "Click to browse books by tags"
 #~ msgstr "Kliknij, aby przeglądać ksiązki po etykietach"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Sortuj według &popularności"
+
 #~ msgid "Change the publisher of this book"
 #~ msgstr "Zmień wydawcę tej ksiązki"
 
@@ -10481,6 +10636,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "The series to which this book belongs"
 #~ msgstr "Seria do której należy książka"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Sortuj etykiety według popularności"
+
 #~ msgid "Usage: %s file.lit"
 #~ msgstr "Użycie: %s plik.lit"
 
@@ -10720,6 +10878,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "The series number"
 #~ msgstr "Numer serii"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Baza danych urządzenia uszkodzona"
+
 #~ msgid "Invalid library location"
 #~ msgstr "Niewłaściwa lokalizacja biblioteki"
 
diff --git a/src/calibre/translations/pt_BR.po b/src/calibre/translations/pt_BR.po
index f7e4d0aaa2..7b3cc0ad4a 100644
--- a/src/calibre/translations/pt_BR.po
+++ b/src/calibre/translations/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-11 00:14+0000\n"
-"Last-Translator: Thomaz Rodrigues Botelho <Unknown>\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 16:48+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Não faz absolutamente nada"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -293,62 +295,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Este perfil é destinado ao SONY PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Este perfil é destinado ao SONY PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Este perfil é destinado ao Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Este perfil é destinado para os livros do Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Este perfil é destinado para o Halin V3 e seus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Este perfil é destinado para o Halin V5 e seus clones."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Este perfil é destinado para o Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Este perfil é destinado ao Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Este perfil é destinado para o Kindle da Amazon."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Este perfil é destinado ao Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Este perfil é destinado ao leitor IRex Digital 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Este perfil é destinado ao IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfil é destindo ao Nook da B&N.."
 
@@ -375,15 +377,15 @@ msgstr "Destinado ao iPad e dispositivos similares com resolução de 768x1024"
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Este perfil é destinado ao Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Este perfil é destindo ao SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Este perfil é destinado ao JetBook de 5 polegadas."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -391,7 +393,7 @@ msgstr ""
 "Este perfil foi projetado para a linha SONY PRS. Os modelos 500/505/700 etc, "
 "em modo paisagem. Especialmente útil para HQ."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é destinado para o Kindle DX da Amazon."
 
@@ -411,15 +413,19 @@ msgstr "Customização de plug-ins locais"
 msgid "Disabled plugins"
 msgstr "Plug-ins desativados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Não foi encontrado um plugin válido em "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicialização do plugin %s falhou, gerando relatório:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -431,18 +437,18 @@ msgstr ""
 "         customiza o calibre usando plugins externos\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Adiciona um plugin via a especificação do caminho de um arquivo zip que o "
 "contenha."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Remover um plugin personalizado por nome. Não tem efeito em plugins nativos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -450,15 +456,15 @@ msgstr ""
 "Personalizar plugin. Use uma vírgula para separar o nome do plugin e a "
 "string de personalização."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Listar todos os plugins instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Habilitar a extensão com nome"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Desabilitar a extensão com nome"
 
@@ -474,37 +480,36 @@ msgstr ""
 "Lista de diretórios separados por vírgulas para enviar e-books ao "
 "dispositivo. O primeiro existente será utilizado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Comunica-se com os telefones S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Comunica-se com iBooks através do iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Dispositivo Apple detectado, iniciando iTunes, aguarde por favor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Atualizando a listagem de metadados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "concluído"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -514,17 +519,17 @@ msgstr ""
 "Remova usando a aplicação iBooks.\n"
 "Clique 'Mostrar Detalhes' para a lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "ajustes para unidades de dispositivos"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Lista ordenada de formatos que serão aceitos pelo dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -532,6 +537,18 @@ msgstr ""
 "Algumas capas não puderam ser convertidas.\n"
 "Clique em 'Mostrar Detalhes' para a listagem."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Notícias"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Comunica-se com o leitor Binatone Readme."
@@ -554,6 +571,10 @@ msgstr "Comunica-se com o leitor Cybook Gen 3 / Opus."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Comunica-se com o leitor EB600."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -566,6 +587,10 @@ msgstr "Comunica-se com o leitor Entourage Edge."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Comunica-se com o leitor ESlick."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -580,14 +605,20 @@ msgstr "Interface de dispositivo"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Comunica-se com leitores Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Comunica-se com leitores Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunica-se com o leitor BOOX."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Comunica-se com o leitor Hanvon N520."
@@ -614,7 +645,7 @@ msgstr "Comunica-se com o leitor IRex Iliad"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -634,15 +665,15 @@ msgstr "Comunica-se com o leitor Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Comunica-se com o leitor JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Comunica-se com o leitor Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Comunica-se com o leitor Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Comunica-se com o leitor Kindle DX."
 
@@ -686,7 +717,7 @@ msgstr "Comunica-se com o leitor Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunica-se com todos os leitores da Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -694,7 +725,7 @@ msgstr ""
 "Lista de campos de metadados separados por vírgulas para transformar em "
 "coleções no dispositivo. Possibilidades incluem: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Sem nome"
@@ -715,24 +746,24 @@ msgstr "Comunica-se com o leitor Newsmy."
 msgid "Communicate with the iPapyrus reader."
 msgstr "Comunica-se com o leitor iPapyrus."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Não foi possível detectar o drive de disco %s. Tente reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Não foi possível identificar o ponto de montagem %s. Tente reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Incapaz de detectar a unidade de disco %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Ajudante de montagem %s não foi encontrado."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -740,39 +771,28 @@ msgstr ""
 "Disco rígido %s não pode ser detectado. Provavelmente seu kernel está "
 "exportando uma versão desatualizada do SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Não foi possível montar a memória principal (Código do erro: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Não há cartão de memória no soquete do dispositivo leitor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Slot %s selecionado não é suportado."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Não há espaço suficiente na memória principal"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Não há espaço suficiente no cartão de memória"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Notícias"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Configurar o Aparelho"
@@ -782,57 +802,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Colocar os arquivos em subdiretórios se o aparelho suportar."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Ler metadados dos arquivos no aparelho"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Modelo para controlar como livros são salvos"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Personalização Extra"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Comunica-se com um leitor de eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Obtendo informações do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Obtendo lista de livros no dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Transferindo livros para o dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Adicionando livros à lista de metadados do aparelho..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Removendo livros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Removendo livros da lista de metadados do aparelho..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Enviando metadados ao dispositivo..."
 
@@ -1119,11 +1143,11 @@ msgstr "Opções para escolher os metadados no arquivo de saída"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
-msgstr "Opções para ajudar a depurar a conversão"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
-msgstr "Listar receitas construídas"
+msgstr "Listar listas construídas"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
@@ -1587,15 +1611,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr "Falhou para decompor data/hora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Convertendo entrada para HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Executando transformações no ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Criando"
 
@@ -1962,84 +1986,88 @@ msgstr ""
 msgid "Comic"
 msgstr "HQ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Editora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produtor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Comentários"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Tags"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Assinatura de tempo (timestamp)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Direitos"
 
@@ -2047,7 +2075,7 @@ msgstr "Direitos"
 msgid "EDITORIAL REVIEW"
 msgstr "Análise Editorial"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2171,6 +2199,10 @@ msgstr "A capa foi salva em"
 msgid "No cover found"
 msgstr "Nenhuma capa foi encontrada"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Baixar metadados"
@@ -2211,6 +2243,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Obter metadados sociais da amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2269,7 +2305,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Capas"
@@ -2504,11 +2540,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47
 msgid "Number of pixels to crop from the right most x (default is %s)"
-msgstr ""
+msgstr "Número de pixels para cortar a partir da direita até x (padrão é %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50
 msgid "Number of pixels to crop from the right most y (default is %s)"
-msgstr ""
+msgstr "Número de pixels para cortar a partir da direita até y (padrão é %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53
 msgid ""
@@ -2569,6 +2605,8 @@ msgstr ""
 "Obter informações sobre um PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2787,7 +2825,7 @@ msgid "Use Roman numerals for series number"
 msgstr "Usar numerais romanos para números da série"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2825,7 +2863,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
-msgstr ""
+msgstr "Enviar noticias baixadas para o dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
@@ -2866,26 +2904,425 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Nenhum livro selecionado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Enviando livros ao dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Livros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "Livros EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "Livros LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "Livros HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "Livros LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "Livros MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Livros TXT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "Livros PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "HQs"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Arquivos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Alguns livros duplicados foram encontrados e fundidos nos seguintes livros "
+"existentes:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Falhou na leitura dos metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Falhou na leitura dos metadados vindos de"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Nenhum livro selecionado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Escolha os formatos para serem apagados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Escolha os formatos para <b>não</b> serem apagados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Eliminar livros do dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Não foi possível obter metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "metadados sociais"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "capas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Baixando %s para %d livro(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Falhou ao obter alguns metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Falhou ao obter metadados para os seguintes:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Falhou em obter metadados:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Erro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Não foi possível editar metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Não pode fundir livros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Pelo menos dois livros devem ser selecionados para fusão"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Você está para fundir mais que 5 livros. Você tem <b>certeza</b> que você "
+"quer prosseguir?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Não foi possível salvar no disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Escolher diretório de destino"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Erro ao salvar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Ocorreu um erro ao salvar."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Não foi possível salvar alguns livros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Nenhum livro selecionado para gerar o catálogo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Gerando %s catálogo..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"Nenhum livro para catalogar\n"
+"Verifique as tags de exclusão"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Catálogo gerado."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Escolha o formato para visualizar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Não foi possível abrir o diretório"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s não tem formatos disponíveis."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
-msgstr ""
+msgstr "Procurando em"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
@@ -2893,7 +3330,7 @@ msgstr "Adicionando..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
-msgstr ""
+msgstr "Procurando em todos os sub-diretórios..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
@@ -2904,15 +3341,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Nenhum livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Adicionado"
@@ -2951,11 +3383,11 @@ msgstr "Salvo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
 msgid "Searching for sub-folders"
-msgstr ""
+msgstr "Procurando por sub-diretórios"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
 msgid "Searching for books"
-msgstr ""
+msgstr "Procurando por livros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
 msgid "Looking for duplicates based on file hash"
@@ -2997,7 +3429,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
 msgid "Choose the location to add books from"
-msgstr ""
+msgstr "Escolha a localização dos livros para adicionar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
 msgid "Select a folder on your hard disk"
@@ -3031,17 +3463,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3060,17 +3492,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3092,9 +3524,61 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Caminho"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Nenhum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
-msgstr ""
+msgstr "Opções CSV/XML"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
@@ -3112,7 +3596,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17
 msgid "Options specific to"
-msgstr ""
+msgstr "Opções específicas para"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
@@ -3151,7 +3635,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3161,7 +3645,7 @@ msgstr "Formulário"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
-msgstr ""
+msgstr "Campos para incluir na saída:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
@@ -3169,8 +3653,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Catálogo"
 
@@ -3229,7 +3713,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:185
 msgid "Options specific to the output format."
-msgstr ""
+msgstr "Opções específicas para o formato de saída."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
@@ -3246,52 +3730,52 @@ msgstr "entrada"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
 msgid "&Number of Colors:"
-msgstr ""
+msgstr "&Números de Cores:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "Disable &normalize"
-msgstr ""
+msgstr "Desativar &normalização"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Keep &aspect ratio"
-msgstr ""
+msgstr "M&anter proporções"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Desativar &nitidez"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
-msgstr ""
+msgstr "Desativar cor&te"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
 msgid "&Wide"
-msgstr ""
+msgstr "&Amplo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "&Landscape"
-msgstr ""
+msgstr "&Paisagem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
 msgid "&Right to left"
-msgstr ""
+msgstr "di&reita para esquerda"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
 msgid "Don't so&rt"
-msgstr ""
+msgstr "Não o&rdenar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
 msgid "De&speckle"
-msgstr ""
+msgstr "Limpar irregularidade&s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
@@ -3304,28 +3788,28 @@ msgstr "F&ormato de saída:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
 msgid "Disable conversion of images to &black and white"
-msgstr ""
+msgstr "Desabilitar conversão de imagens para preto e &branco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
-msgstr ""
+msgstr "Depuração"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
-msgstr ""
+msgstr "Depurar o processo de conversão."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:51
 msgid "Choose debug folder"
-msgstr ""
+msgstr "Escolha o diretório de depuração"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
-msgstr ""
+msgstr "Diretório de depuração inválido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
-msgstr ""
+msgstr "Falhou em criar o diretório de depuração"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:50
 msgid ""
@@ -3346,6 +3830,9 @@ msgid ""
 "of the conversion process. This HTML can sometimes serve as a good starting "
 "point for hand editing a conversion."
 msgstr ""
+"O processo de depuração libera o HTML intermediário gerado em vários "
+"estágios do processo de conversão. Este HTML pode algumas vezes servir como "
+"ponto inicial para a conversão manual."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
@@ -3357,19 +3844,19 @@ msgstr "Não &dividir nas quebras de página"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
-msgstr ""
+msgstr "Sem &capa padrão"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
-msgstr ""
+msgstr "Sem capa &SVG"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
-msgstr ""
+msgstr "Preserv&ar proporções da capa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
-msgstr ""
+msgstr "Dividir arquivos &maiores que:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
@@ -3552,7 +4039,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
-msgstr ""
+msgstr "Habilita &autorotação de imagens amplas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
@@ -3858,11 +4345,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3947,12 +4429,12 @@ msgid "Footer regular expression:"
 msgstr "Expressão regular para o Rodapé:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -4000,7 +4482,7 @@ msgstr "Sumário"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18
 msgid "Control the creation/conversion of the Table of Contents."
-msgstr ""
+msgstr "Controla a criação/conversão do Sumário."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
@@ -4024,7 +4506,7 @@ msgstr "Número de &Links para adicionar no Sumário"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
-msgstr ""
+msgstr "&Limiar do capítulo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
@@ -4162,11 +4644,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Navegar pelas capas"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4187,279 +4677,291 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "O dispositivo não está mais conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Obter informações do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Obter listagem de livros do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Enviar metadados ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Enviar %d livros ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Eliminar livros do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Baixar livros do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Ver livro no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Escolher ação padrão de enviar para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Enviar para a memória principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Enviar ao cartão de memória A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Enviar ao cartão de memória B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Enviar um formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Erro ao se comunicar com o dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " detectado."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "selecionado para envio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Escolha o formato para enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Nenhum dispositivo disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Não foi possível enviar: o dispositivo está desconectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Nenhum cartão disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 "Não foi possível enviar: o dispositivo não possui um cartão de memória"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Enviando e-mail para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Nenhum formato apropriado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Falhou ao enviar livros por e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Falha ao enviar por e-mail os seguintes livros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Notícias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Enviar notícias para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Enviando notícias ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Enviando livros ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Não há espaço no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "Selecione os formatos disponíveis e sua ordem para este dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Caminho"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formatos"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4475,7 +4977,7 @@ msgstr "&Próximo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
-msgstr ""
+msgstr "Meus Livros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
@@ -4604,170 +5106,173 @@ msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
+"Se marcado, notícias baixadas serão automaticamente enviadas por email "
+"<br>para este endereço de email (desde que ele esteja em um dos formatos "
+"listados)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr "Amplo"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Erro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Escolher plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Este plugin não pode ser desativado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Não é possível desativar o plugin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Plugin não configurável"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Não é necessário configurar o plugin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Registro de erros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Registro de acessos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Falhou ao iniciar o servidor de conteúdo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Localização do banco de dados inválida.<br>Não é possível gravar em "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4880,173 +5385,183 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Enviando para o &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferências"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Obter metadados &sociais (rótulos/avaliações/etc.) por padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "S&obrescrever autor e título por padrão quando obter metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Selecionar &idioma (requer reinicialização):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Baixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "F&ormato de Saída Preferido:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "ordem preferida dos formatos de &entrada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Use numerais &Romanos para números da série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
-msgid "Search as you type"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+msgid "Search as you type"
+msgstr "Pesquisa na medida que você digita"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automaticamente enviar &notícias baixadas para o leitor de ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
+"&Números de capas para mostrar no modo navegador (precisa reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Médio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Adicionar um endereço de email para enviar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "&Adicionar e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Tornar &padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "&Remover e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5056,106 +5571,106 @@ msgstr ""
 "das notícias baixadas serão automaticamente enviados para todos os endereços "
 "de email que foram marcados como Auto-envio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "Depurar a detecção de &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&porta do servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nome de &usuário:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Senha:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Exibir senha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "&Interr&omper servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Testar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Ver &registros do servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5166,33 +5681,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Ativar/&Desativar plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Configurar plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Remover plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Instalar novo plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Arquivo de plugin:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Adicionar"
 
@@ -5229,10 +5744,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
 
@@ -5248,68 +5764,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Avaliações, mostradas com estrelas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "Inglês"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5332,6 +5849,8 @@ msgid ""
 "Used for searching the column. Must contain only digits and lower case "
 "letters."
 msgstr ""
+"Usado para pesquisar a coluna. Deve conter somente números e letras "
+"minúsculas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
 msgid ""
@@ -5371,7 +5890,7 @@ msgstr "Formato para &datas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
-msgstr ""
+msgstr "Coletando informações de depuração"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
@@ -5418,6 +5937,27 @@ msgstr "&Exibir este aviso novamente"
 msgid "ERROR"
 msgstr "ERRO"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Formato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5634,11 +6174,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr "Escolha formatos para "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Livros"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5677,69 +6212,77 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Baixando capa..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Não foi possível obter a capa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
-msgstr ""
+msgstr "O tempo de espera de download espirou."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "Ocorreram erros na obtenção dos metadados sociais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Não foi possível obter metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "É necessário especificar ao menos ou o ISBN, ou o título, ou os autores ou a "
 "editora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5833,6 +6376,7 @@ msgstr "Cancelando..."
 msgid ""
 "The current saved search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"A pesquisa atual salva irá ser <b>permanentemente apagada</b>. Tem certeza?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
 msgid "Saved Search Editor"
@@ -5840,27 +6384,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
 msgid "Saved Search: "
-msgstr ""
+msgstr "Pesquisa salva: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
 msgid "Select a saved search to edit"
-msgstr ""
+msgstr "Selecione uma pesquisa salva para editar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
 msgid "Delete this selected saved search"
-msgstr ""
+msgstr "Apague essas pesquisas salvas selecionadas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
 msgid "Enter a new saved search name."
-msgstr ""
+msgstr "Entre um novo nome para pesquisa salva."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
 msgid "Add the new saved search"
-msgstr ""
+msgstr "Adicionar uma nova pesquisa salva"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
 msgid "Change the contents of the saved search"
-msgstr ""
+msgstr "Modificar o conteúdo da pesquisa salva"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
@@ -5876,7 +6420,7 @@ msgstr "Criado por: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
 msgid "Last downloaded: never"
-msgstr ""
+msgstr "Último baixado: nunca"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
 msgid "%d days, %d hours and %d minutes ago"
@@ -5884,20 +6428,20 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
-msgstr ""
+msgstr "Último baixado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
-msgstr ""
+msgstr "Agendar download de notícias"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
-msgstr ""
+msgstr "Adicionar uma fonte de notícias personalizada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
 msgid "Download all scheduled new sources"
-msgstr ""
+msgstr "Baixar todas as fontes de notícias agendadas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
@@ -5910,15 +6454,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
 msgid "Recipes"
-msgstr ""
+msgstr "Listas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
-msgstr ""
+msgstr "Baixar todas as listas agendadas de uma vez"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
-msgstr ""
+msgstr "Baixar &todas agendadas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
@@ -5926,7 +6470,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
-msgstr ""
+msgstr "&Agendar para baixar:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
@@ -5974,6 +6518,8 @@ msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
+"Intervalo para baixar esta lista. Um valor de zero significa que a lista irá "
+"ser baixada a cada hora."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
@@ -5991,7 +6537,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
-msgstr ""
+msgstr "&Agenda"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
@@ -6014,10 +6560,12 @@ msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
+"Apagar as notícias baixadas mais antigas que o número de dias especificado. "
+"Coloque zero para desligar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
-msgstr ""
+msgstr "Apagar notícias mais antigas que "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
@@ -6026,6 +6574,7 @@ msgstr "contém"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
 msgid "The text to search for. It is interpreted as a regular expression."
 msgstr ""
+"O texto para procurar. Ele é interpretado como uma expressão regular."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
 msgid ""
@@ -6041,7 +6590,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
-msgstr ""
+msgstr "Pesquisa avançada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
@@ -6096,15 +6645,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
-msgstr ""
+msgstr "Escolha os formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autores"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Editoras"
 
@@ -6217,12 +6766,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6254,25 +6803,25 @@ msgstr "Você deve selecionar pelo menos um dos itens da lista."
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6295,7 +6844,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
-msgstr ""
+msgstr "O arquivo anexo: %s é uma lista para baixar %s."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
@@ -6305,12 +6854,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
 msgid "Switch to Advanced mode"
-msgstr ""
+msgstr "Mudar para o modo Avançado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 msgid "Switch to Basic mode"
-msgstr ""
+msgstr "Mudar para o modo Básico"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
@@ -6378,7 +6927,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
-msgstr ""
+msgstr "Listas do usuário disponíveis"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
@@ -6424,7 +6973,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
-msgstr ""
+msgstr "O artigo mais antigo para download"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
@@ -6464,6 +7013,9 @@ msgid ""
 "For help with writing advanced news recipes, please visit <a "
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
 msgstr ""
+"Para ajudar em escrever listas de notícias avançadas, por favor visite <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">Listas do "
+"Usuário</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
@@ -6514,11 +7066,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6554,54 +7106,208 @@ msgstr "ISBN"
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Editar metadados individualmente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Editar metadados em lote"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Obter metadados e capas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Obter apenas os metadados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Baixar apenas as capas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Obter somente os metadados sociais"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Fundir no primeiro livro selecionado - apagar os outros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Fundir no primeiro livro selecionado - manter os outros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Adicionar livros de um diretório"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Adicionar livros de diretórios, incluindo subdiretórios (um livro por "
+"diretório, assumindo que cada arquivo é o mesmo livro em um formato "
+"diferente)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Adicionar livros de diretórios, incluindo subdiretórios (vários livros por "
+"diretório, assumindo que cada arquivo é um livro diferente)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Adicionar livro vazio. (Entrada de livro sem nenhum formato)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Salvar no disco"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Exibir"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Exibir formato específico"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Converter individualmente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Conversão em massa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Criar um catálogo de livros em sua biblioteca do calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Rodar o assistente de boas vindas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Livros similares..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Progresso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
-msgstr ""
+msgstr "Tarefa desconhecida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Não consigo parar tarefas que comunicam-se com o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Indísponivel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Trabalhos:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6613,112 +7319,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Tamanho (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Avaliação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Nenhum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "Na Biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Formato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
-msgstr ""
+msgstr "Direita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr "Restaurar o layout padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6808,288 +7492,262 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
-msgstr ""
+msgstr "Registrar informação de depuração no console"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr "Não verificar updates"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr "Falhou em criar biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "Falhou em criar biblioteca do calibre em: %r. Abortando."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr "Falhou em criar biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s já está em execução."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
-msgstr ""
+msgstr "parte superior direita da tela."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
-msgstr ""
+msgstr "parte inferior direita da tela."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "tente reiniciando o seu computador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "tente eliminando o arquivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr "&Restringir à:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
+"Livros mostrados serão restritos aos que correspondem a pesquisa salva "
+"selecionada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Pesquisa avançada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Procurar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Limpar Pesquisa Rápida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
+"Escolha uma pesquisa salva ou entre um nome para uma nova pesquisa salva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
-msgstr ""
+msgstr "Copia o texto da pesquisa atual (ao invés do nome da pesquisa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
-msgstr ""
+msgstr "Salva a pesquisa atual com o nome mostrado na caixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
-msgstr ""
+msgstr "Apaga a pesquisa atual salva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Classificar por &popularidade"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Corresponder algum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Corresponder todos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr "Criar, editar, e apagar categorias do usuário"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr "Gerenciar categorias do &usuário"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Adicionar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Remover livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Editar informação meta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr "Fusão de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Enviar para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Salvar no disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Obter notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Converter eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Exibir"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Exibir detalhes do livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Livros do mesmo autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Livros nesta série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Livros deste editor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Livros com as mesmas tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7121,13 +7779,34 @@ msgstr "O livro não possui nem título nem ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
+msgstr "Pesquisar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+"A pesquisa selecionada será <b>permanentemente apagada</b>. Você tem certeza?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Pesquisar (Para Pesquisa Avançada clique no botão da esquerda)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Pesquisas Salvas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
-msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(todos os livros)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
@@ -7190,84 +7869,77 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Trabalhos:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
-msgstr "Gerenciar Buscas Salvas"
+msgstr "Gerenciar Pesquisas Salvas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
+msgstr "Pesquisas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Nome de pesquisa duplicado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "O nome da pesquisa salva %s já está sendo usado."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Corresponder todos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Corresponder algum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "Gerenciar categorias do &usuário"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7309,634 +7981,118 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Pesquisar (Para Pesquisa Avançada clique no botão da esquerda)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Buscas Salvas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Erro ao se comunicar com o dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "Faça uma &doação para contribuir com calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Editar metadados individualmente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Editar metadados em lote"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Obter metadados e capas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Obter apenas os metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Baixar apenas as capas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Obter somente os metadados sociais"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Fundir no primeiro livro selecionado - apagar os outros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Fundir no primeiro livro selecionado - manter os outros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Adicionar livros de um diretório"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Adicionar livros de diretórios, incluindo subdiretórios (um livro por "
-"diretório, assumindo que cada arquivo é o mesmo livro em um formato "
-"diferente)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Adicionar livros de diretórios, incluindo subdiretórios (vários livros por "
-"diretório, assumindo que cada arquivo é um livro diferente)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Adicionar livro vazio. (Entrada de livro sem nenhum formato)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Exibir formato específico"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Converter individualmente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Conversão em massa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Criar um catálogo de livros em sua biblioteca do calibre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Livros similares..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Navegar pelas capas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(todos os livros)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Dispositivo: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " detectado."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Nenhum livro selecionado"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Enviando livros ao dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "Livros EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "Livros LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "Livros HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "Livros LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "Livros MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Livros TXT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "Livros PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "HQs"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Arquivos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Alguns livros duplicados foram encontrados e fundidos nos seguintes livros "
-"existentes:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Falhou na leitura dos metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Falhou na leitura dos metadados vindos de"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Nenhum livro selecionado"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Eliminar livros do dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Não foi possível obter metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "metadados sociais"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "capas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Baixando %s para %d livro(s)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Falhou ao obter alguns metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Falhou ao obter metadados para os seguintes:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Falhou em obter metadados:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Não foi possível editar metadados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "Não pode fundir livros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Pelo menos dois livros devem ser selecionados para fusão"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Você está para fundir mais que 5 livros. Você tem <b>certeza</b> que você "
-"quer prosseguir?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Não foi possível salvar no disco"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Escolher diretório de destino"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Erro ao salvar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Ocorreu um erro ao salvar."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Não foi possível salvar alguns livros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "Nenhum livro selecionado para gerar o catálogo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Gerando %s catálogo..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"Nenhum livro para catalogar\n"
-"Verifique as tags de exclusão"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Catálogo gerado."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Não foi possível abrir o diretório"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s não tem formatos disponíveis."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Não foi possível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Erro ao converter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Falha</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Atualização disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
 msgstr ""
+"%s foi atualizado para a versão %s. Veja as <a href=\"http://calibre-"
+"ebook.com/whats-new\">novas funções</a>. Visitar a página de download?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
@@ -8233,7 +8389,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
-msgstr ""
+msgstr "Rolar para a direita"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
@@ -8249,7 +8405,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
-msgstr ""
+msgstr "Pesquisar por texto no livro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
@@ -8406,15 +8562,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Imprimir eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8424,70 +8580,82 @@ msgstr ""
 "%d\n"
 "Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Clique para ver os livros disponíveis em seu computador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 "Clique para ver os livros da memória principal de seu dispositivo leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 "Clique para ver os livros do cartão de memória A de seu dispositivo leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 "Clique para ver os livros do cartão de memória B de seu dispositivo leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8623,6 +8791,9 @@ msgid ""
 "location. If a calibre library already exists at the new location, calibre "
 "will switch to using it."
 msgstr ""
+"Se você tem uma biblioteca do calibre, era será copiada para a nova "
+"localização. Se uma biblioteca do calibre já existe na nova localização, "
+"calibre irá usá-la."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
@@ -8750,53 +8921,58 @@ msgid ""
 "directly on the device. To do this you have to turn on the calibre content "
 "server."
 msgstr ""
+"<p>Se você usa o aplicativo de ebooks <a "
+"href=\"http://www.lexcycle.com/download\">Stanza</a> no seu iPhone/iTouch, "
+"você pode acessar sua coleção de livros do calibre diretamente no "
+"dispositivo. Para fazer isto você tem que ligar o servidor de conteúdo do "
+"calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8956,6 +9132,9 @@ msgid ""
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
+"Filtrar os resultados pela frase de pesquisa. Para o formato da frase de "
+"pesquisa, por favor veja a documentação à respeito de pesquisa no Manual do "
+"Usuário. O padrão é não filtrar."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
@@ -8967,7 +9146,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
-msgstr ""
+msgstr "O Caractere usado para separar os campos. O padrão é um espaço."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
@@ -8977,11 +9156,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
-msgstr ""
+msgstr "Campos inválidos. Campos disponíveis:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
-msgstr ""
+msgstr "Campo de ordenação inválido. Campos disponíveis:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
@@ -9202,9 +9381,9 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
-msgstr ""
+msgstr "Mostrar informação detalhada de saída. Útil para depuração"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
@@ -9283,45 +9462,49 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrando o banco de dados antigo para a biblioteca de ebook em "
 "%s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Compactando banco de dados"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Avaliações"
 
@@ -9338,6 +9521,8 @@ msgid ""
 "The author sort string. To use only the first letter of the name use "
 "{author_sort[0]}"
 msgstr ""
+"Os caracteres para ordenação por autor. Para usar somente a primeira letra "
+"do nome use {author_sort[0]}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
@@ -9412,6 +9597,10 @@ msgid ""
 "subdirectory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
+"O modelo para controlar o nome de arquivo e estrutura de diretório dos "
+"arquivos salvos. O padrão é \"%s\" o qual irá salvar livros em subdiretórios "
+"por autor com arquivos contendo o título e autor. Controles disponíveis são: "
+"{%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
 msgid ""
@@ -9420,6 +9609,10 @@ msgid ""
 "directory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
+"O modelo para controlar o nome de arquivo e estrutura de diretório para "
+"enviar para o dispositivo. O padrão ´w \"%s\" o qual irá salvar os livros em "
+"diretórios por autor com arquivos contendo o título e autor. Controles "
+"disponíveis são: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78
 msgid ""
@@ -9449,7 +9642,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
 msgid "Settings to control the calibre content server"
-msgstr ""
+msgstr "Configurações para controlar o servidor de conteúdo do calibre"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
 msgid "The port on which to listen. Default is %default"
@@ -9507,43 +9700,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "AVALIAÇÃO: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "SÉRIE: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Livros em sua biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9612,7 +9805,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
-msgstr ""
+msgstr "Lista das pesquisas salvas nomeadas"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:700
 msgid "User-created tag browser categories"
@@ -9687,34 +9880,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+msgid "English (Ireland)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Inglês (China)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Espanhol (Paraguai)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9750,7 +9947,7 @@ msgstr "Artigo sem título"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
-msgstr ""
+msgstr "Baixar conteúdo periódico da internet"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:36
 msgid ""
@@ -9770,93 +9967,93 @@ msgstr "Senha para sites que requerem autenticação para acesso ao conteúdo."
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:46
 msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
-msgstr ""
+msgstr "Não baixar a ultima versão das listas do servidor do calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
-msgstr ""
+msgstr "Fonte de notícias desconhecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "A receita \"%s\" requer um usuário e senha."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Download concluído"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Falha ao baixar os seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Falha ao baixar partes do artigos a seguir:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tLinks que falharam:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Tentando obter capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
-msgstr ""
+msgstr "Iniciando o download [%d tarefa(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Não foi possível baixar capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Baixando capa de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
-msgstr ""
+msgstr "Imagem de cabeçalho baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Artigo sem título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Artigo transferido: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
-msgstr ""
+msgstr "Transferência de artigo falhou: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -9864,11 +10061,13 @@ msgstr ""
 "Falou em logar-se, verifique seu nome de usuário e senha para o serviço de "
 "Periódicos do calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
 msgstr ""
+"Você não tem permissão para baixar esta publicação. Ou sua inscrição expirou "
+"ou você excedeu o número máximo de dowloads por hoje."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
@@ -9885,7 +10084,7 @@ msgstr "Agendado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9895,18 +10094,18 @@ msgstr ""
 "\n"
 "Onde URL é, por exemplo, http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Diretório base no qual a URL é salva. O padrão é %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 "Tempo em segundos para esperar uma resposta do servidor. Padrão: %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -9914,7 +10113,7 @@ msgstr ""
 "Máximo número de níveis na recursividade, ou seja a profundidade de links "
 "para seguir. Padrão %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9922,13 +10121,13 @@ msgstr ""
 "O máximo número de arquivos para download. Isto só se aplica à arquivos de "
 "tags <a href>. O padrão é %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9936,7 +10135,7 @@ msgstr ""
 "A codificação de caracteres para os websites que você está tentando fazer "
 "download. O Padrão é tentar adivinhar a codificação."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -9947,7 +10146,7 @@ msgstr ""
 "corresponder a uma das expressões regulares, ele será seguido. Por padrão "
 "todos os links são seguidos."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9961,7 +10160,7 @@ msgstr ""
 "padrão, nenhum link é ignorado. Se ambos, --filter-regexp e --match-regexp "
 "são especificados juntos, então --filter-regexp é aplicado primeiro."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Não baixar folhas de estilo CSS."
 
@@ -10094,3 +10293,12 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ "Não força o texto a estar justificado na saída. Se o texto já é exibido "
 #~ "justificado ou não depende de suporte a texto justificado no formato do "
 #~ "ebook e do dispositivo de leitura."
+
+#~ msgid "Sort by &popularity"
+#~ msgstr "Classificar por &popularidade"
+
+#~ msgid "Create, edit, and delete user categories"
+#~ msgstr "Criar, editar, e apagar categorias do usuário"
+
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr "Falhou em criar biblioteca do calibre em: %r. Abortando."
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index 56779b2eed..1c4c0e33c9 100644
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:46+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:19+0000\n"
 "Last-Translator: Ilya Telegin <devi29rus@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -27,12 +27,12 @@ msgstr "Ничего не делает"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -44,22 +44,22 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -105,44 +105,46 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -298,62 +300,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Этот профиль предназначен для SONY PRS 300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Этот профиль предназначен для SONY PRS 900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Этот профиль предназначен для Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Этот профиль предназначен для книг Mobipocket"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Этот профиль предназначен для Hanlin V3 и её клонов."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Этот профиль предназначен для Hanlin V5 и её клонов."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Этот профиль предназначен для Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Этот профиль предназначен для Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Этот профиль предназначен для Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Этот профиль предназначен для iRex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Этот профиль предназначен для iRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Этот профиль предназначен для IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Этот профиль предназначен для  B&N Nook."
 
@@ -380,15 +382,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Этот профиль предназначен для  SONY PRS-300"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Этот профиль предназначен для 5-дюймовой JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -396,7 +398,7 @@ msgstr ""
 "Этот профиль предназначен для линейки SONY PRS: 500/505/700 - в ландшафтном "
 "режиме. Полезен для комиксов."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Этот профиль предназначен для Amazon Kindle DX."
 
@@ -416,15 +418,19 @@ msgstr "Настройка локального модуля"
 msgid "Disabled plugins"
 msgstr "Отключенные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Не найден подходящий модуль в "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Неудачная инициализация модуля %s:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -436,30 +442,30 @@ msgstr ""
 "    Настроить calibre при помощи внешних модулей.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Установите модуль, указав путь к zip файлу, содержащему его."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Удалить модуль по имени. Не действует на встроенные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Настроить модуль. Укажите имя модуля и строку настроек, разделённые запятой."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Вывести список всех установленных модулей"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Включить указанный модуль"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Отключить указанный модуль"
 
@@ -475,59 +481,70 @@ msgstr ""
 "Разделённый запятаями список директории для отправки e-books на это "
 "устройство. Будет использовано первое в списке устройство"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Связь с телефоном S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "настройки драйверов устройств"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Сортированный список форматов, поддерживаемых устройством"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Новости"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Общение с устройством для чтения электронных книг Binatone Readme."
@@ -551,6 +568,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Соединяться с EB600."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -563,6 +584,10 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Соединяться с ESlick."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -577,14 +602,20 @@ msgstr "Интерфейс устройства"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Соединяться с Hanlin V3"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Соединяться с Hanlin V5"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Соединяться с BOOX"
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Communicate with the Hanvon N520"
@@ -611,7 +642,7 @@ msgstr "Соединяться с IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "Джош Шембер"
 
@@ -631,15 +662,15 @@ msgstr "Соединяться с Iriver Story."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Соединяться с JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Соединяться с Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Соединяться с Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Соединяться с Kindle DX."
 
@@ -683,7 +714,7 @@ msgstr "Соединяться с Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -691,7 +722,7 @@ msgstr ""
 "Разделенный запятыми список полей метаданных преобразовать в коллекции на "
 "устройстве. Возможности включают: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Безымянный"
@@ -712,24 +743,24 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Не удалось определить диск %s. Попробуйте перезагрузить устройство."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Невозможно определить точку монтирования %s. Попробуйте перезагрузку."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Не удалось определить диск %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Не могу найти mount helper: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -737,39 +768,28 @@ msgstr ""
 "Не удалось обнаружить диск %s. Возможно, ваше ядро использует устаревшую "
 "версию SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Невозможно примонтировать основную память (Код ошибки: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "В устройство не вставлена карта памяти."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Выбранный слот: %s не поддерживается."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Не хватает свободного места в основной памяти"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Не хватает свободного места на карте памяти"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Новости"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Настройка устройства"
@@ -779,57 +799,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Помещать файлы в поддиректории если устройство поддерживает их"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Получить метаданные из файлов на устройстве"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Шаблон контроля способа сохранения книг"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Дополнительная настройка"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Соединиться с электронной книгой."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Получаю информацию об устройстве..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Получаю список книг с устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Передаю книги на устройство..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Добавляю книги в список метаданных устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Удаляю книги с устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Удаляю книги из списка метаданных устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Отправляю метаданные на устройство..."
 
@@ -1562,15 +1586,15 @@ msgstr "Значения номера в серии и рейтинге долж
 msgid "Failed to parse date/time"
 msgstr "Невозможно разобрать дату / время"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Конвертирую входной файл в HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Выполняю преобразования книги..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Создаю"
 
@@ -1931,84 +1955,88 @@ msgstr "Набор шрифтов для использования серии \
 msgid "Comic"
 msgstr "Комикс"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Заголовок"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Издатель"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Спонсор"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Комментарии"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Теги"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Серия"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Язык"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Временная метка"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Опубликовано"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Права"
 
@@ -2016,7 +2044,7 @@ msgstr "Права"
 msgid "EDITORIAL REVIEW"
 msgstr "ПРОСМОТР РЕДАКТИРОВАНИЯ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2138,6 +2166,10 @@ msgstr "Обложка сохранена"
 msgid "No cover found"
 msgstr "Обложка отсутствует"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Загрузка метаданных"
@@ -2178,6 +2210,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Загрузить общедоступные метаданные из amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2251,7 +2287,7 @@ msgstr ""
 "Загрузка изображения обложки для книги распознается через ISBN на сайте "
 "LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Обложка"
@@ -2573,6 +2609,8 @@ msgstr ""
 "Получить информацию о PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Автор"
 
@@ -2823,8 +2861,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Использовать Римские цифры для нумерации"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Сортировать список эпилогов по популярности"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2902,23 +2940,418 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Скопирована"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Копировать"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Копирования в буфер обмена"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Выберите файлы"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Нет Выбранных книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Загрузка книг в устройство."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "Книги EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "Книги LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "Книги HTML"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "Книги LIT"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "Книги MOBI"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Текстовые книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "Книги PDF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Комиксы"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Архивы"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Сбой чтения метаданных"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Нет выбранных книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Удаляются книги из устройства."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Выбранные книги будут <b>навсегда удалены</b> вместе с файлами с Вашего "
+"компьютера. Вы уверены?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Не удалось загрузить метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "обложек"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "метаданных"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Загрузка %s для %d книг(и)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Не удалось загрузить некоторые метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Не удалось загрузить метаданные:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Ошибка"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Невозможно редактировать метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Невозможно сохранить на диск"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Выберете директорию получателя"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Ошибка при сохранении"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Произошла ошибка при сохранении."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Не удалось сохранить некоторые книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Книги не найдены"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Вызвать новость из "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " загружено."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Не преобразуется"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Невозможно просмотреть"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Выберете для просмотра формат"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Выбраны несколько книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Не могу открыть папку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s неизвестный формат."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Поиск"
@@ -2940,15 +3373,10 @@ msgid "The specified directory could not be processed."
 msgstr "Специальных каталог не может быть обработан."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Нет книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Книги не найдены"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Добавлена"
@@ -3070,17 +3498,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3099,17 +3527,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3131,6 +3559,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Путь"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Форматы"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Ничего"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CVS/XML Параметры"
@@ -3190,7 +3670,7 @@ msgstr "вывод"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3208,8 +3688,8 @@ msgstr "Параметры книг"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Каталог"
 
@@ -3909,11 +4389,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Выберете для просмотра формат"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3994,12 +4469,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Неправильное регулярное выражение"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Неправильное регулярное выражение: %s"
 
@@ -4207,11 +4682,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Просмотр по обложкам"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4232,279 +4715,293 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "Устройство не подключено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Получить информацию о устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Получить список книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Отправить метаданные в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Загружено %d книг на устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Удалить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Загрузить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Смотреть книги на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Установить действие по умолчанию для \"отправить в устройство\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "Отправить email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Отправить в основную память"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Отправить на карту памяти A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Отправить на карту памяти B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Ошибка подключения с устройством"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Ошибка согласования устройства"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Была временная ошибка общения с устройством. Пожалуста, переподключите "
+"устройство или перегрузите его."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Устройство: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " определено."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Подключено "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "Отослать выбранное"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Выберите формат для отправки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Нет устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Устройство не подсоединено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Нет карточки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Не могу передать: в устройстве нет карты памяти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "Прикреплено, Вы найдете e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "от"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "в %s формате."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Отправка email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Нет подходящего формата"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Книги не отправлены по email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Не отправлен email со следующими книгами:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Отослано email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Новости:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Прикреплено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Отослать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Отправляются новости на устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Отправка книги в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Нет места на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Не могу загрузить книги на устройство из-за отсутствия свободной памяти. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Использовать подкаталоги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Путь"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Форматы"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4655,166 +5152,166 @@ msgstr ""
 msgid "new email address"
 msgstr "новый  email адрес"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Ошибка"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "Неверный путь к плагинам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s - неверный путь к плагинам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Использовать плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Плагин не может быть выключен"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Плагин %s не может быть выключен"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Плагин не настраиваемый"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Плагин: %s не требует настройки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Не могу удалить встроеный плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " не может быть удален. Это встроенный плагин. Попробуйте отключить его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Лог ошибок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Лог доступа:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Сбой запуска контент-сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Неверный размер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Размер %s указан неверно. Должен быть задан в виде [ширина]x[высота]"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Неправильное расположение базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Неправильное расположение базы данных "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Должна быть дирректория."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Неправильное расположение базы данных.<br>Немогу записать "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "Не удалось проверить целостность базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4925,39 +5422,40 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Пересылка на &устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Настройки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "&Расположение книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Просмотреть расположение новой базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Сообщить о выходе &новой версии."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "&Задержка сети по умолчанию:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -4965,169 +5463,177 @@ msgstr ""
 "Установить задержку по умолчанию для сетевых вызовов (т.е. в любое время вы "
 "выходите в интернет для получения информации)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " секунд"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Выбрать &язык (необходим рестарт):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Обычный"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Высокий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Низкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Приоритет задачи"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Использовать &Римские цифры для нумерации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "использовать иконку в трее (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Показывать уведомления в трее"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Показывать обложку в отдельном окне (нужен перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Поиск в процессе набора"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Отправлять автоматически закаченные новости в устройство для чтения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Удалить новость из библиотеки, когда она автоматически попадает к читателю"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Количество обложек показываемых в режиме просмотра (нужна перезагрузка "
 "calibre)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Большой"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Средний"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Маленький"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&Размер кнопок на панеле инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Показать надписи на кнопках панели инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Выбрать видимые &столбцы в просмотре библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Использовать внутренний вьювер для:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Добавить email адрес получателя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "Добавить email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "По умолчанию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "Удалить email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -5137,25 +5643,25 @@ msgstr ""
 "коллекции ваших книг из любой точки мира с помощью браузера. Любые изменения "
 "в настройках вступят в силу после перезапуска сервера."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Порт сервера:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Пользователь:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Пароль:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5163,7 +5669,7 @@ msgstr ""
 "Если вы не установили свой пароль, то кто угодно сможет получить доступ к "
 "вашим книгам через веб-интерфейс."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5171,45 +5677,45 @@ msgstr ""
 "Максимальный размер ([ширина]x[высота]) обложек при отображении. Более "
 "крупные обложки подгоняются по размеру. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Макс. размер обложки:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Показать пароль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Запустить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "Ост&ановить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Проверить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "Запустить сервер авт&оматически после загрузки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Просмотреть логи &сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5220,34 +5726,34 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Здесь можно настроить поведение Calibre, указав какие плагины он использует."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Включить/Выключить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "Настроить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "Удалить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Добавить новый плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "Файл плагина:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "Добавить"
 
@@ -5284,10 +5790,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Дата"
 
@@ -5303,68 +5810,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5473,6 +5981,27 @@ msgstr "Показывать это предупреждение снова"
 msgid "ERROR"
 msgstr "ОШИБКА"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Формат"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Сортировка по Автору"
@@ -5686,11 +6215,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Книги"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5729,67 +6253,75 @@ msgstr "Обложка в формате %s неправильная"
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Загрузка обложки..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Не могу получить обложку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Не могу получить обложку.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Таймаут загрузки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Плохая обложка"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Обложка с неправильной картинкой"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Произошли ошибки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Не могу доставить метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "Нужно указаить ISBN, название, автора или издателя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -6158,12 +6690,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Авторы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Публикация"
 
@@ -6282,12 +6814,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "Добавить тег к существующим и применить его к текущей книге"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6319,25 +6851,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6592,11 +7124,11 @@ msgstr "Обычный параметр (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Нет совпадений"
 
@@ -6632,54 +7164,208 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Обычный параметр (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Сохранить единый формат диска..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Редактировать метаданные индивидуально"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Редактировать основные метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Загрузить метаданные и обложки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Загрузить только метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Загрузить только обложки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Загрузить только социальные метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Добавить книги из одной директории"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Добавить книги из директорий, включая поддиректории (одна книга на "
+"директорию, считая, что каждый файл в директории - та же самая книга в "
+"разных форматах)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Добавить книги из директорий, включая поддиректории (одна книга на "
+"директорию, считая, что каждый файл - отдельная книга)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Добавить пустую книгу (книга без каких-либо форматов)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Сохранить на диск"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Сохранить на диск в одну директорию"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Сохранять на диск только формат %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Вид"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Просмотреть особый формат"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Удалить выбранные книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Удалить файлы определенного формата из выбранных книг."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Удалить все форматы из выбранных книг, исключая..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Удаление обложки с выбранных книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Индивидуальное преобразование"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Общее преобразование"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Создать каталог книг в вашей библиотеке \"calibre\""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Запустить начальный мастер настройки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Похожие книги..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Задание"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Статус"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Ход выполнения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Рабочее время"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Неизвестная работа"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Немогу удалить задание"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Немогу удалить задание при подключенном устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Задание уже запущено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Недоступен"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Работа:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Кликнуть для просмотра списка активных задач"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Работы"
 
@@ -6691,112 +7377,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Размер (МБ)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Ничего"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Книга <font face=\"serif\">%s</font> из %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Формат"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Дважды кликните по <b>редактировать</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Запрещено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6894,282 +7558,253 @@ msgstr "Выводить отладочную информацию на конс
 msgid "Do not check for updates"
 msgstr "Не проверять наличие обновлений"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Плохое расположение базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s уже запущен."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "попробуйте перезагрузить ваш компьютер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "попробуйте удалить файл"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Расширенный поиск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Поиск:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Сброс быстрого поиска"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Сортировать по &популярности"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Сравнить некоторые"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Сравнить все"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Добавить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Удалить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Редактировать мета информацию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Отправить в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Сохранить на диск"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Скачать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Конвертировать"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Вид"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Открыть папку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Показать подробности"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Книги этого же автора"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Книги той же серии"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Книги того же издателя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Книги с такими же тегами"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Конфигурация Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7202,15 +7837,35 @@ msgstr "У книги нет ни названия, ни ISBN"
 msgid "No matches found for this book"
 msgstr "Нет совпадений в этой книге"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Найти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Поиск (для расширенного поиска нажмите кнопку слева)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -7271,82 +7926,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Работа:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Кликнуть для просмотра списка активных задач"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Сравнить все"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Сравнить некоторые"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7388,606 +8036,76 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Сохранить единый формат диска..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Поиск (для расширенного поиска нажмите кнопку слева)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Ошибка подключения с устройством"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "Восстановить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "Пожертвовать на развитие calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Перезапуск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Для получения справки см.:<a href=\"%s\">Руководство пользователя </><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Редактировать метаданные индивидуально"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Редактировать основные метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Загрузить метаданные и обложки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Загрузить только метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Загрузить только обложки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Загрузить только социальные метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Добавить книги из одной директории"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Добавить книги из директорий, включая поддиректории (одна книга на "
-"директорию, считая, что каждый файл в директории - та же самая книга в "
-"разных форматах)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Добавить книги из директорий, включая поддиректории (одна книга на "
-"директорию, считая, что каждый файл - отдельная книга)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Добавить пустую книгу (книга без каких-либо форматов)."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Сохранить на диск в одну директорию"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Сохранять на диск только формат %s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Просмотреть особый формат"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Удалить выбранные книги"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Удалить файлы определенного формата из выбранных книг."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Удалить все форматы из выбранных книг, исключая..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Удаление обложки с выбранных книг"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Индивидуальное преобразование"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Общее преобразование"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Создать каталог книг в вашей библиотеке \"calibre\""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Запустить начальный мастер настройки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Похожие книги..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Просмотр по обложкам"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Устройство: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " определено."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Подключено "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "База данных устройства неисправна"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>База данных книг устройства неисправна. Попробуйте "
-"следующее:\n"
-"                <ol>\n"
-"                <li>Отключите устройство. Дождитесь завершения  создания "
-"базы данных (т.е. дождитесь ее готовности к использованию). Подключите "
-"устройство. Теперь должно все заработать в приложении %(app)s. Если этого не "
-"произошло, то переходите к следующему пункту.</li>\n"
-"                <li>Закройте %(app)s приложение. Найдите файл media.xml в "
-"основной памяти устройства. Удалите его. Отключите устройство. Подождите "
-"создания файла. Подключите устройство снова и запустите приложение "
-"%(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Нет Выбранных книг"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Загрузка книг в устройство."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "Книги EPUB"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "Книги LRF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "Книги HTML"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "Книги LIT"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "Книги MOBI"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Текстовые книги"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "Книги PDF"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Комиксы"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Архивы"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Сбой чтения метаданных"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Нет выбранных книг"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Выбранные книги будут <b>навсегда удалены</b> вместе с файлами с Вашего "
-"компьютера. Вы уверены?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Удаляются книги из устройства."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Не удалось загрузить метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "обложек"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "метаданных"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Загрузка %s для %d книг(и)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Не удалось загрузить некоторые метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Не удалось загрузить метаданные:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Невозможно редактировать метаданные"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Невозможно сохранить на диск"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Выберете директорию получателя"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Ошибка при сохранении"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Произошла ошибка при сохранении."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Не удалось сохранить некоторые книги"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Вызвать новость из "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " загружено."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Не преобразуется"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Невозможно просмотреть"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Выбраны несколько книг"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Не могу открыть папку"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s неизвестный формат."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Пока запущено задание, не могу настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Нет доступной подробной информации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "Не доступна подробная информация книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Ошибка согласования устройства"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Была временная ошибка общения с устройством. Пожалуста, переподключите "
-"устройство или перегрузите его."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -7995,22 +8113,22 @@ msgstr ""
 "является результато труда многих добровольцев по всему миру. Если Вы сочли "
 "его полезным, будьте добры пожертвовать на его развитие."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Активные задания"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8018,7 +8136,7 @@ msgstr ""
 "продолжит работать в трее. Для завершения работы выберите<b>Quit</b> в "
 "контекстном меню трея."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8026,11 +8144,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Доступно обновление"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8502,15 +8620,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Печать книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8520,7 +8638,7 @@ msgstr ""
 "%d\n"
 "книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8530,7 +8648,7 @@ msgstr ""
 "%s\n"
 "доступно"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8540,7 +8658,7 @@ msgstr ""
 "%s\n"
 "доступна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8550,46 +8668,58 @@ msgstr ""
 "%s\n"
 "доступна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Нажмите, чтобы посмотреть книги имеющиеся на вашем компьютере"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr "Нажмите, чтобы посмотреть книги в основной памяти читалки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr "Нажмите, чтобы посмотреть книги на карте памяти A читалки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr "Нажмите, чтобы посмотреть книги на карте памяти B читалки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Изменить регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Верхний регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Нижний регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8855,48 +8985,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -9336,7 +9466,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Показать детальную информацию. Используется для отладки."
 
@@ -9425,43 +9555,47 @@ msgstr ""
 "\n"
 "Для справки: %%prog команда --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Миграция старой базы данных в %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Копирование <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Сжатие базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9650,43 +9784,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9829,34 +9963,38 @@ msgid "English (Pakistan)"
 msgstr "Английский (Пакистан)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Английский (Сингапур)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9915,97 +10053,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr "Не загружать последнюю версию встроенных рецептов с сервера calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Неизвестный новостной ресурс"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Рецепт \"%s\" требует имя пользожателя и пароль"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Закачка завершена"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Неудачная загрузка следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Неудачная загрузка частей следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " из "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tБитые ссылки:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Не может быть вызвана статья. Запустите с -w чтобы увидеть причину."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Вызываются заготовки..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Получить заготовки для оглавления"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Попытка скачать обложку..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "Создаем титульные данные..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Начало загрузки [%d поток(и)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Заготовки закачиватся в %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Невозможно скачать обложку: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Скачивается обложка из %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "Выходные данные изображения загрузили"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Статья без названия"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Статья скачена: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Ошибка загрузки статьи: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Доставляется материал"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10026,7 +10164,7 @@ msgstr "Запланированно"
 msgid "Custom"
 msgstr "Пользовательский"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10036,19 +10174,19 @@ msgstr ""
 "\n"
 "Где URL на пример http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Основная директория, в которую сохранятся URL. По умолчанию: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 "Максимальное время ожидания ответа от сервера. По умолчанию: %default с"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10056,7 +10194,7 @@ msgstr ""
 "Максимально число уровней вложения, т.е. глубина последовательных ссылок. По "
 "умолчанию: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10064,7 +10202,7 @@ msgstr ""
 "Максимальное количество файлов для скачивания. Применимо только к файлам из "
 "тегов <a href>. По умолчанию: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10072,7 +10210,7 @@ msgstr ""
 "Минимальный интервал в секундах между последовательными вызовами. По "
 "умолчанию: %default с"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10080,7 +10218,7 @@ msgstr ""
 "Кодировка вебсайтов, которые вы собираетесь скачивать. По умолчанию делается "
 "попытка определения кодировки."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -10091,7 +10229,7 @@ msgstr ""
 "скачиваться тогда, когда она совпадет хотя бы с одним из регулярных "
 "выражений. По умолчанию, никакие ссылки не скачиваются."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10105,7 +10243,7 @@ msgstr ""
 "умолчанию, ссылки не отклоняются. Если указаны обе опции --filter-regexp и --"
 "match-regexp, то вначале будет учитываться --filter-regexp."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Не скачивать файлы стилей CSS."
 
@@ -10451,12 +10589,18 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Working"
 #~ msgstr "Работа"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "База данных устройства неисправна"
+
 #~ msgid "Copying library to "
 #~ msgstr "Копирование библиотеки в "
 
 #~ msgid "Could not move database"
 #~ msgstr "Невозможно перенести базу данных"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Сортировать по &популярности"
+
 #~ msgid "/Unknown"
 #~ msgstr "/Неизвестное"
 
@@ -10784,6 +10928,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Frequently used directories"
 #~ msgstr "Часто используемая директория"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Сортировать список эпилогов по популярности"
+
 #~ msgid "Format for &single file save:"
 #~ msgstr "Формат для единственного сохраненного файла:"
 
@@ -12078,6 +12225,35 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "Соединяться с Sony PRS-600/700/900"
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>База данных книг устройства неисправна. Попробуйте "
+#~ "следующее:\n"
+#~ "                <ol>\n"
+#~ "                <li>Отключите устройство. Дождитесь завершения  создания "
+#~ "базы данных (т.е. дождитесь ее готовности к использованию). Подключите "
+#~ "устройство. Теперь должно все заработать в приложении %(app)s. Если этого не "
+#~ "произошло, то переходите к следующему пункту.</li>\n"
+#~ "                <li>Закройте %(app)s приложение. Найдите файл media.xml в "
+#~ "основной памяти устройства. Удалите его. Отключите устройство. Подождите "
+#~ "создания файла. Подключите устройство снова и запустите приложение "
+#~ "%(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid "Send specific format to storage card B"
 #~ msgstr "Отправить определённый формат на карту памяти B"
 
diff --git a/src/calibre/translations/sl.po b/src/calibre/translations/sl.po
index 0fedb11438..ce0d99f3d2 100644
--- a/src/calibre/translations/sl.po
+++ b/src/calibre/translations/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-10 06:33+0000\n"
-"Last-Translator: Janko Slatenšek <Unknown>\n"
+"POT-Creation-Date: 2010-06-11 22:51+0000\n"
+"PO-Revision-Date: 2010-06-11 18:59+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -27,8 +27,8 @@ msgstr "Ne naredi popolnoma nič"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -50,10 +50,10 @@ msgstr "Ne naredi popolnoma nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
@@ -101,39 +101,39 @@ msgstr "Ne naredi popolnoma nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:293
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:491
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1303
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:302
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:880
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:917
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1515
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1517
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1639
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
@@ -445,50 +445,50 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:75
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:81
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:214
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:217
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:282
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:318
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:921
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:947
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:325
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:952
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:499
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:703
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:705
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:776
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -576,7 +576,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr ""
 
@@ -654,7 +654,7 @@ msgid ""
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:142
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -710,22 +710,22 @@ msgstr ""
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:775
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:809
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:815
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:843
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:141
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1399
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr ""
@@ -752,44 +752,44 @@ msgstr ""
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr ""
 
@@ -1395,15 +1395,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1740,24 +1740,24 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:848
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
 msgid "Title"
 msgstr "Naslov"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:849
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Založnik"
 
@@ -1770,29 +1770,29 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
 msgid "Comments"
 msgstr "Opombe"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1030
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
 msgid "Tags"
 msgstr "Značke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
 msgid "Series"
 msgstr "Serija"
@@ -1802,13 +1802,13 @@ msgid "Language"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
 msgid "Timestamp"
 msgstr "Časovna znamka"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr ""
 
@@ -2585,20 +2585,24 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:395
 msgid "Choose Files"
 msgstr ""
 
@@ -2623,12 +2627,12 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:608
 msgid "No books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid "No books found"
 msgstr ""
 
@@ -2784,12 +2788,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2888,8 +2892,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1362
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1380
 msgid "Catalog"
 msgstr ""
 
@@ -3573,7 +3577,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
 msgid "Choose the format to view"
 msgstr "Izberite format, ki ga želite videti"
 
@@ -3657,12 +3661,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Neveljaven regularni izraz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Neveljaven regularni izraz: %s"
 
@@ -3870,11 +3874,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:120
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:172
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3895,243 +3907,247 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:43
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:143
 msgid "Device no longer connected."
 msgstr "Naprava ni več priklopljena."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:248
 msgid "Get device information"
 msgstr "Pridobi podatke o napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:274
 msgid "Get list of books on device"
 msgstr "Pridobi seznam knjig iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:284
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:293
 msgid "Send metadata to device"
 msgstr "Pošlji meta podatke v napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:302
 msgid "Upload %d books to device"
 msgstr "Prenesi %d knjig v napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:317
 msgid "Delete books from device"
 msgstr "Izbriši knjige iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:334
 msgid "Download books from device"
 msgstr "Prenesi knjige iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
 msgid "View book on device"
 msgstr "Poglej knjigo na napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
-msgid "Send to main memory"
-msgstr "Pošlji v glavni pomnilnik"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
-msgid "Send to storage card A"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+msgid " and delete from library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Send to main memory"
+msgstr "Pošlji v glavni pomnilnik"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+msgid "Send to storage card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
-msgid "Main Memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+msgid "Main Memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:441
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:481
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:486
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:494
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:609
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:623
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:626
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:672
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:677
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:690
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:999
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1006
 msgid "No suitable formats"
 msgstr "Ni ustreznih formatov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:721
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:746
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:747
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:751
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:779
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:790
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:820
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1000
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:849
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
 msgid "Sending books to device."
 msgstr "Pošlji knjige v napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1007
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
 msgid "No space on device"
 msgstr "Na napravi ni več prostora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1056
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4152,9 +4168,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:99
 msgid "Path"
 msgstr "Pot"
 
@@ -4163,8 +4179,8 @@ msgstr "Pot"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:100
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
 msgid "Formats"
 msgstr "Formati"
@@ -4324,8 +4340,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Napaka"
@@ -4413,7 +4429,7 @@ msgid "Access log:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:419
 msgid "Failed to start content server"
 msgstr ""
 
@@ -4581,7 +4597,7 @@ msgid "Sending to &device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
@@ -4928,9 +4944,9 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:850
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
 msgid "Date"
 msgstr "Datum"
@@ -4947,68 +4963,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5328,7 +5345,7 @@ msgid "Choose formats for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:876
 msgid "Books"
 msgstr ""
 
@@ -5370,67 +5387,67 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:449
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:452
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Cannot fetch cover"
 msgstr "Prenos naslovnice ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:572
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Prenos naslovnice ni uspel.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:562
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:578
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:579
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:613
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:642
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:643
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:714
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:715
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5776,7 +5793,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
-msgstr ""
+msgstr " "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:125
 msgid ""
@@ -5911,12 +5928,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "Dodaj značko k trenutni knjigi in značkam, ki so na voljo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:442
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6211,11 +6228,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Brez zadetka"
 
@@ -6251,54 +6268,198 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:33
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:49
+msgid "Edit metadata individually"
+msgstr "Posamično urejanje meta podatkov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata in bulk"
+msgstr "Paketno urejanje meta podatkov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:57
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:68
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:79
+msgid "Add books from a single directory"
+msgstr "Dodaj knjige iz enega direktorija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:81
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Shrani na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100
+msgid "Save to disk in a single directory"
+msgstr "Shrani na disk v en direktorij"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1782
+msgid "Save only %s format to disk"
+msgstr "Shrani samo %s format na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1785
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Poglej"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:116
+msgid "View specific format"
+msgstr "Poglej specifičen format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:122
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:124
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:145
+msgid "Convert individually"
+msgstr "Posamična pretvorba"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:147
+msgid "Bulk convert"
+msgstr "Paketna pretvorba"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:151
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:192
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:297
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:315
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:336
+msgid "Side bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:366
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Posel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Napredek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Čas izvajanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Neznan posel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Prekinitev posla ni mogoča"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Ne morem prekiniti poslov, ki komunicirajo z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Posel je že bil pognan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Ni na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:278
+msgid "Jobs:"
+msgstr "Posli:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:294
+msgid "Click to see list of active jobs."
+msgstr "Klikni za seznam aktivnih poslov."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:354
 msgid " - Jobs"
 msgstr " - Posli"
 
@@ -6310,112 +6471,112 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1029
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1033
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
 msgid "None"
 msgstr "Nič"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1039
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1097
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:350
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:847
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:851
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1023
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:101
 msgid "Collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1082
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dvoklikni me da me <b>urediš</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:504
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:505
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6511,282 +6672,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Napredno iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "I&skanje:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Resetiraj Hitro Iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Dodaj knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Odstrani knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Uredi meta podatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Pošlji napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Shrani na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Prenesi novice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Pretvori eKnjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Poglej"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6818,15 +6950,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:249
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:302
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:344
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Najdi (Za Napredno Iskanje pritisnite gumb na levi)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:371
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6887,82 +7039,62 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Posli:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Klikni za seznam aktivnih poslov."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
 msgid "Rename"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:155
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:158
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:162
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:169
 msgid "Manage "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:173
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:184
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:377
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:238
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:451
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:452
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:652
+msgid "Sort by &popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:656
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:661
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7004,193 +7136,59 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Najdi (Za Napredno Iskanje pritisnite gumb na levi)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "Error communicating with device"
 msgstr "Napaka pri komuniciranju z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:189
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:246
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Posamično urejanje meta podatkov"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Paketno urejanje meta podatkov"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Dodaj knjige iz enega direktorija"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Shrani na disk v en direktorij"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Shrani samo %s format na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Poglej specifičen format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Posamična pretvorba"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Paketna pretvorba"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:485
 msgid "Device: "
 msgstr "Naprava: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
 msgid " detected."
 msgstr " zaznan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:519
 msgid "Connected "
 msgstr "Povezan "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:531
 msgid "Device database corrupted"
 msgstr "Podatkovna baza poškodovana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:532
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7220,210 +7218,210 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:772
 msgid "Use library only"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:773
 msgid "User annotations generated from main library only"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1214
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1527
 msgid "No books selected"
 msgstr "Nobena od knjig ni izbrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:604
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:629
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:657
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:663
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:682
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:691
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:696
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:816
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:817
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:916
 msgid "Uploading books to device."
 msgstr "Prenašanje knjig na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:878
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:880
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:882
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:883
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:884
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:885
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:886
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:890
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:925
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:926
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:935
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:936
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1696
 msgid "No book selected"
 msgstr "Nobena od knjig ni izbrana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:969
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:987
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1061
 msgid "Deleting books from device."
 msgstr "Izbriši knjige iz naprave."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1097
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1113
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1115
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1117
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1139
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1140
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1143
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1192
 msgid "Cannot edit metadata"
 msgstr "Spreminjanje meta podatkov ni mogoče"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1216
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1217
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1221
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -7431,7 +7429,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1232
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -7441,89 +7439,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1244
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
 msgid "Cannot save to disk"
 msgstr "Ne morem shraniti na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1379
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1410
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1427
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1443
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1446
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1447
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1461
 msgid "Fetching news from "
 msgstr "Prenašam novice iz "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
 msgid "Cannot convert"
 msgstr "Pretvorba ni možna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1555
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1729
 msgid "Cannot view"
 msgstr "Pogled ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1685
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1686
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -7531,44 +7529,44 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1695
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1730
 msgid "%s has no available formats."
 msgstr "%s nima razpoložljivih formatov."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1764
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
 msgid "Cannot configure"
 msgstr "Nemogoča konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1765
 msgid "Cannot configure while there are running jobs."
 msgstr "Spreminjanje konfiguracije med poganjanjem poslov ni mogoče."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
 msgid "No detailed info available"
 msgstr "Podrobne informacije niso na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1818
 msgid "No detailed information is available for books on the device."
 msgstr "Podrobne informacije za knjige na napravi niso na voljo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1870
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error talking to device"
 msgstr "Napaka pri pogovoru z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7576,53 +7574,53 @@ msgstr ""
 "Prišlo je do napake pri komuniciranju z napravo. Prosim ponovno zaženite ali "
 "izklopite in ponovno vklopite napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1900
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1928
 msgid "Conversion Error"
 msgstr "Pretvorna Napaka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1901
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1914
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1929
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1969
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1994
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1997
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2001
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2053
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2072
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7630,11 +7628,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Zadnja verzija: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2080
 msgid "Update available"
 msgstr "Navoljo je posodobitev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2081
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8101,82 +8099,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9007,27 +9017,27 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1665
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Selitev stare podatkovne baze v knjižnico eknjig v %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694
 msgid "Copying <b>%s</b>"
 msgstr "Kopiram <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1711
 msgid "Compacting database"
 msgstr "Krčim bazo"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1804
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1845
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1867
 msgid "Checked id"
 msgstr ""
 
@@ -9482,97 +9492,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Neznan Vir Novic"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:605
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid "Download finished"
 msgstr "Prenos končan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "Failed to download the following articles:"
 msgstr "Prenos naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download parts of the following articles:"
 msgstr "Prenos nekaterih delov od naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:712
 msgid " from "
 msgstr " iz "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
 msgid "\tFailed links:"
 msgstr "\tNeuspešne povezave:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:831
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:852
 msgid "Fetching feeds..."
 msgstr "Prenašam feed-e..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
 msgid "Got feeds from index page"
 msgstr "Dobljeni feed-i iz indeks strani"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
 msgid "Trying to download cover..."
 msgstr "Poskušam prenesti naslovnico ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:865
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:946
 msgid "Starting download [%d thread(s)]..."
 msgstr "Začenjam prenos [%d nit(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Feeds downloaded to %s"
 msgstr "Feed-i prenešeni v %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:972
 msgid "Could not download cover: %s"
 msgstr "Prenos naslovnico ne bil mogoč: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:984
 msgid "Downloading cover from %s"
 msgstr "Prenašam naslovnico iz %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1024
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1220
 msgid "Untitled Article"
 msgstr "Članek brez naslova"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Article downloaded: %s"
 msgstr "Članek prenešen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1302
 msgid "Article download failed: %s"
 msgstr "Prenos članka ni uspel: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1319
 msgid "Fetching feed"
 msgstr "Prenašam feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1466
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1482
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/sq.po b/src/calibre/translations/sq.po
index 226c926e6a..7fb355338f 100644
--- a/src/calibre/translations/sq.po
+++ b/src/calibre/translations/sq.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:36+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:08+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -276,62 +278,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
@@ -355,21 +357,21 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
@@ -389,15 +391,19 @@ msgstr ""
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -405,29 +411,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -441,59 +447,70 @@ msgid ""
 "first one that exists will be used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Lajme"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -516,6 +533,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -528,6 +549,10 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -542,14 +567,20 @@ msgstr ""
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
@@ -576,7 +607,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr ""
 
@@ -596,15 +627,15 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
@@ -648,13 +679,13 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr ""
@@ -675,61 +706,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Lajme"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Formësoni Pajisjen"
@@ -739,57 +759,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Përshtatje Ekstra"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Merr të dhëna paisjeje..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr ""
 
@@ -1382,15 +1406,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
@@ -1698,84 +1722,88 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titull"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autor(ë)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Botues"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Komente"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seri"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Gjuhë"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Botuar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Të drejta"
 
@@ -1783,7 +1811,7 @@ msgstr "Të drejta"
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1882,6 +1910,10 @@ msgstr ""
 msgid "No cover found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1920,6 +1952,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1976,7 +2012,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Kapak"
@@ -2260,6 +2296,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
 
@@ -2465,7 +2503,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2542,23 +2580,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Libra"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Gabim"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
@@ -2580,15 +3011,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
@@ -2707,17 +3133,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2736,17 +3162,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2768,6 +3194,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Shteg"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formate"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Asnjë"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2827,7 +3305,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2845,8 +3323,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
@@ -3526,11 +4004,6 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3611,12 +4084,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3824,11 +4297,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3849,278 +4330,290 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Pajisje: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Pa pajisje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-libër:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Lajme:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
-msgid "Save &template:"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Shteg"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formate"
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
+msgid "Save &template:"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
@@ -4264,165 +4757,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Gabim"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Zgjidhni shtojcë"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Personalizojeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Regjistrim gabimesh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Madhësi e pavlefshme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4533,279 +5026,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekonda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Panel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4816,33 +5318,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4879,10 +5381,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
 
@@ -4898,68 +5401,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5068,6 +5572,27 @@ msgstr ""
 msgid "ERROR"
 msgstr "GABIM"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5274,11 +5799,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Libra"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5317,67 +5837,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Shkarkimit i mbaroi koha."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Kapak i Prishur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Kapaku s'është pamje e vlefshme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Pati gabime"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Leje e mohuar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5734,12 +6262,12 @@ msgid "Choose formats"
 msgstr "Zgjidhni formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autorë"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Botuesa"
 
@@ -5852,12 +6380,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5889,25 +6417,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6149,11 +6677,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6189,54 +6717,203 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Ruaje në disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Shfaqje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Gjendje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Përparim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6248,112 +6925,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Vlerësim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Asnjë"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6449,282 +7104,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr "Mos kontrollo për përditësime"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Kërkim i thelluar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Kërko:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Shtoni libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Hiqni libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Përpunoni të dhëna meta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "P"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Dërgoje te pajisja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Ruaje në disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "R"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Bjer lajme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Shndërro E-libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "N"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Shfaqje"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "q"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Hap dosjen mëmë"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Shfaq hollësi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Libra nga po ai autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Libra në këtë seri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Libra nga ky botues"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Libra me të njëjtat etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Formësoni calibre-in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -6754,15 +7380,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6823,82 +7469,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -6940,619 +7579,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Pajisje: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8019,82 +8151,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8355,48 +8499,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8774,7 +8918,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8855,43 +8999,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9077,43 +9225,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9256,34 +9404,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9340,97 +9492,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9451,55 +9603,55 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9508,6 +9660,6 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr ""
diff --git a/src/calibre/translations/sr.po b/src/calibre/translations/sr.po
index a8d9ab4dbe..9fba4fe745 100644
--- a/src/calibre/translations/sr.po
+++ b/src/calibre/translations/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-07 04:53+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-19 00:12+0000\n"
 "Last-Translator: Vladimir Oka <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Ne radi baš ništa"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -291,62 +293,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Ovaj profil je namenjen SONY PRS 300 čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Ovaj profil je namenjen SONY PRS-900 čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Ovaj profil je namenjen Microsoft Readeru."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Ovaj profil je namenjen Mobipocket e-knjigama."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Ovaj profil je namenjen Hanlin V3 čitaču i klonovima."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Ovaj profil je namenjen Hanlin V5 čitaču i klonovima."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Ovaj profil je namenjen Cybook G3 čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Ovaj profil je namenjen Cybook Opus čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Ovaj profil je namenjen Amazon Kindle čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Ovaj profil je namenjen Irex Illiad čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Ovaj profil je namenjen IRex Digital Reader 1000 čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Ovaj profil je namenjen IRex Digital Reader 800 čitaču."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ovaj profil je namenjen B&N Nook čitaču."
 
@@ -373,15 +375,15 @@ msgstr "Namenjeno za iPad i slične uređaje sa rezolucijom 768x1024"
 msgid "This profile is intended for the Kobo Reader."
 msgstr "Ovaj profil je namenjen Kobo čitaču"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Ovaj profil je namenjen SONY PRS-300 čitaču."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Ovaj profil je namenjen 5-inčnom JetBook čitaču."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -389,7 +391,7 @@ msgstr ""
 "Ovaj profil je namenjen SONY PRS liniji čitača. Konkretno za 500/505/700/... "
 "u horizontalnom položaju. Uglavnom je koristan za stripove."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ovaj profil je namenjen Amazon Kindle DX čitaču."
 
@@ -409,15 +411,19 @@ msgstr "Podešavanja za lokalne dodatke"
 msgid "Disabled plugins"
 msgstr "Neaktivni dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr "Uključeni dodaci"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "Nije pronađen ispravan dodatak u "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicijalizovanje dodatka %s nije uspelo. Izveštaj o grešci je:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -429,17 +435,17 @@ msgstr ""
 "        Podesi calibre učitavanjem spoljnjih dodataka.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Instaliraj dodatak biranjem direktorijuma u kome se nalazi ZIP fajl koji ga "
 "sadrži."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Ukloni dodatak po imenu. Nema efekta na ugrađene dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -447,15 +453,15 @@ msgstr ""
 "Podesi dodatak. Navedi ime dodatka i komandu za podešavanje razdvojene "
 "zarezom."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Izlistaj sve instalirane dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "Uključi navedeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "Isključi navedeni dodatak"
 
@@ -471,37 +477,36 @@ msgstr ""
 "Zarezima razdvojena lista direktorijuma koji treba da se pošalju na uređaj. "
 "Biće iskorišćen prvi postojeći direktorijum iz liste"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Uspostavi komunikaciju sa S60 telefonima"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Uspostavi komunikaciju sa iBooks preko iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Detektovan je Apple uređaj. Pokrećem iTunes. Molim sačekajte ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr "Ažuriram spisak metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d od %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "završeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -511,17 +516,17 @@ msgstr ""
 "Izbrišite knjige korišćenjem iBooks aplikacije.\n"
 "Kliknite na 'Prikaži detalje' za spisak."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "podešavanja veznika za uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Uređena lista formata koje uređaj prihvata"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -529,6 +534,18 @@ msgstr ""
 "Neki omoti nisu mogli da budu konvertovani.\n"
 "Kliknite na 'Prikaži detalje' za spisak."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Vesti"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Uspostavi komunikaciju s Binatone Readme čitačem."
@@ -551,6 +568,10 @@ msgstr "Uspostavi komunikaciju s Cybook Gen 3 / Opus čitačem."
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Uspostavi komunikaciju sa EB600 čitačem."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr "Uspostavi komunikaciju s PocketBook 301 čitačem"
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -563,6 +584,10 @@ msgstr "Uspostavi komunikaciju sa Entourage Edge uređajem"
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Uspostavi komunikaciju sa ESlick čitačem."
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Uspostavi komunikaciju sa Sigmatek čitačem"
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -577,14 +602,22 @@ msgstr "Interfejs uređaja"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Uspostavi komunikaciju s Hanlin V3 čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Uspostavi komunikaciju s Hanlin V5 čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Uspostavi komunikaciju s BOOX čitačem."
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+msgid ""
+"Comma separated list of directories to send e-books to on the device. The "
+"first one that exists will be used."
+msgstr ""
+"Zarezima razdvojen spisak direktorijuma u koje će se slati knjige na uređaj. "
+"Biće upotrebljen prvi postojeći."
+
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Uspostavi komunikaciju s Hanvon N520 čitačem."
@@ -611,7 +644,7 @@ msgstr "Uspostavi komunikaciju sa IRex Iliad čitačem."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -631,15 +664,15 @@ msgstr "Uspostavi komunikaciju sa Iriver Story čitačem."
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Uspostavi komunikaciju s JetBook čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Uspostavi komunikaciju s Kindle čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Uspostavi komunikaciju s Kindle 2 čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Uspostavi komunikaciju s Kindle DX čitačem."
 
@@ -683,7 +716,7 @@ msgstr "Uspostavi komunikaciju sa Sony PRS-500 čitačem."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Uspostavi komunikaciju sa svim Sony čitačima."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -691,7 +724,7 @@ msgstr ""
 "Zarezima razdvojena lista polja za metapodatke koji će biti pretvoreni u "
 "kolekcije na uređaju. Mogućnosti uključuju: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Neimenovano"
@@ -712,23 +745,23 @@ msgstr "Uspostavi komunikaciju s Newsmy čitačem"
 msgid "Communicate with the iPapyrus reader."
 msgstr "Uspostavi komunikaciju s iPapyrus čitačem"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Ne mogu da pronađem disk %s. Probajte da ponovo pokrenete računar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "Ne mogu da pronađem uređaj %s. Probajte da ponovo pokrenete računar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "Ne mogu da pronađem disk %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Ne mogu da pronađem pomoćnika za povezivanje: %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -736,39 +769,28 @@ msgstr ""
 "Ne mogu da pronađem disk %s. Vaš kernel verovatno izvozi zastarelu verziju "
 "SYSFSa."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Ne mogu da se povežem sa osnovnom memorijom (kod greške: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Čitač nema memorijsku karticu u ovom ležištu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Izabrano ležište: %s nije podržano."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Nema dovoljno mesta u osnovnoj memoriji."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Nema dovoljno mesta na memorijskoj kartici"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Vesti"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Podesi uređaj"
@@ -778,57 +800,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Stavi fajlove u pod-direktorijume ako ih uređaj podržava"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Pročitaj metapodatke iz fajlova na uređaju"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr "Koristi polje za sortiranje po autoru umesto imena autora"
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Šablon koji kontroliše kako će knjige biti snimljene"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Dodatna podešavanja"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "Uspostavi komunikaciju s čitačem e-knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Pročitaj informacije o uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Preuzimam spisak knjiga sa uređaja..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Šaljem knjige na uređaj..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Dodajem knjige u spisak metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Uklanjam knjige sa uređaja..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Uklanjam knjige iz spiska metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Šaljem metapodatke na uređaj..."
 
@@ -1581,15 +1607,15 @@ msgstr "Vrednosti za broj knjige u seriji moraju biti brojevi. Ignorišem"
 msgid "Failed to parse date/time"
 msgstr "Nisam uspeo da pročitam datum/vreme"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Konvertujem ulaz u HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "Izvodim transformacije na e-knjizi..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Kreiram"
 
@@ -1951,84 +1977,88 @@ msgstr "Porodica štampanih slova za ugnežđivanje"
 msgid "Comic"
 msgstr "Strip"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Naslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Izdavač"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Komentari"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etikete"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Jezik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Vremenska oznaka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Objavljeno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Prava"
 
@@ -2036,7 +2066,7 @@ msgstr "Prava"
 msgid "EDITORIAL REVIEW"
 msgstr "REČ UREDNIKA"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -2156,6 +2186,10 @@ msgstr "Naslovna strana je snimljena u"
 msgid "No cover found"
 msgstr "Nije nađena nijedna naslovna strana"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr "Preuzmi metapodatke s Douban.com"
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Preuzimanje metapodataka"
@@ -2196,6 +2230,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr "Preuzmi društvene metapodatke s amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr "Preuzmi podatke o seriji s librarything.com"
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2268,7 +2306,7 @@ msgstr ""
 "\n"
 "Preuzmi naslovnu stranu knjige određene ISBN brojem s LibrayThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Naslovna strana"
@@ -2601,6 +2639,8 @@ msgstr ""
 "Traži podatke of PDF fajlu.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
 
@@ -2857,8 +2897,8 @@ msgid "Use Roman numerals for series number"
 msgstr "Koristi rimske cifre za broj serije"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Sortiraj etikete po popularnosti"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr "Sortiraj spisak etiketa po nazivu, popularnosti, ili oceni"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2935,23 +2975,439 @@ msgstr "Ograniči najveći broj poslova na broj procesora"
 msgid "tag browser categories not to display"
 msgstr "kategorije koje ne treba prikazati u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "Izgled korisničkog interfejsa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr "Prikaži srednju ocenu po stavki u izlogu etiketa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopirano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Kopiraj u memoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Izaberi fajlove"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Koristi samo biblioteku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "Koristite samo beleške iz glavne biblioteke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Nije izabrana nijedna knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "Nije izabrana nijedna knjiga za preuzimanje beleški"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "Dodaj korisničke beleške u bazu podataka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Poslednja pročitana strana: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Poslednja pročitana strana: Lokacija %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Lokacija %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Strana %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Lokacija %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "Koliko praznih knjiga?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "Koliko praznih knjiga treba da se doda?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Prenosim knjige na uređaj."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Topaz knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Knijge u tekst formatu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Stripovi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Arhive"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Podržane knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Dodao sam neke knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Pronađeni su neki duplikati i dodati sledećim već postojećim knjigama:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Nisam uspeo da pročitam metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Nisam upseo da pročitam metapodatke iz"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr "Dodaj u biblioteku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Nije izabrana nijedna knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr "Nisu pronađeni fajlovi s knjigama"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "Ne mogu da obrišem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Izaberite formate za brisanje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Izaberite formate koji <b>neće</b> biti obrisani"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr "Ne mogu da izbrišem knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr "Nije priključen nijedan uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr "Osnovna memorija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr "Memorijska kartica A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr "Memorijska kartica B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr "Nema knjiga koje mogu biti izbrisane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr "Nijedna od izabranih knjiga se ne nalazi na uređaju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Brišem knjige sa uređaja."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Izabrane knjige će biti <b>obrisane zauvek</b> i fajlovi uklonjeni s vašeg "
+"računara. Da li ste sigurni?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"Izabrane knjige će biti <b>zauvek izbrisane</b> s vašeg uređaja. Da li ste "
+"sigurni?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Ne mogu da preuzmem metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "društveni metapodaci"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "naslovne strane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metapodaci"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Preuzimam %s za %d knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Nisam uspeo da preuzmem neke metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Nisam uspeo da preuzmem metapodatke za:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Nisam uspeo da preuzmem metapodatke:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Greška"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Ne mogu da promenim metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Ne mogu da spojim knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Za spajanje je potrebno izabrati bar dve knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Svi formati i metapodaci iz izabranih knjiga će biti dodati <b>prvoj "
+"izabranoj knjizi.</b><br><br> Druga i ostale izabrane knjige neće biti "
+"izbrisane niti promenjene.<br><br>Molim vas da potvrdite da želite da "
+"nastavite"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Svi formati i metapodaci iz izabranih knjiga će biti dodati <b>prvoj "
+"izabranoj knjizi.</b><br><br> Posle spajanja, druga i ostale izabrane knjige "
+"će biti <b>izbrisane</b>. <br><br>Svi formati prve izabrane knjige će biti "
+"sačuvani, a svi duplikati formata u drugoj i ostalim izabranim knjigama će "
+"biti trajno <b>izbrisani</b> sa vašeg računara.<br><br>Da li ste "
+"<b>sigurni</b> da želite da nastavite?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Pripremili ste se za spajanje više od 5 kjniga. Da li ste <b>sigurni</b> da "
+"želite da nastavite?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Ne mogu da snimim na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Promeni ciljni direktorijum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Greška pri snimanju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Došlo je do greške pri snimanju."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Nisam uspeo da snimim neke knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Kliknite na dugme za više detalja da vidite koje."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Nema knjiga za koje bi se kreirao katalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Kreiram katalog %s..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Nije nađena nijedna knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"Nema knjiga za katalog\n"
+"Proverite ignorisane etikete"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Katalog je kreiran."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Direktorijum za izvoz kataloga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Izaberi odredište za %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Preuzimam vesti sa "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " preuzeto."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Ne mogu da konvertujem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Počinjem konverziju %d knjiga."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Nemoguće pregledati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Izaberite format za prikaz"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Izabrano je više knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+"Pokušavate da otvorite %d knjiga. Otvaranje previše knjiga odjednom može da "
+"bude sporo i ima negativan uticaj na brzinu odziva vašeg računara. Jednom "
+"započet, ovaj proces se ne može prekinuti pre završetka. Da li želite da "
+"nastavite?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Ne mogu da otvorim direktorijum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s nema raspoloživih formata."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Tražim u"
@@ -2973,15 +3429,10 @@ msgid "The specified directory could not be processed."
 msgstr "Nisam mogao da obradim navedeni direktorijum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Nema knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Nije nađena nijedna knjiga"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Dodato"
@@ -3114,17 +3565,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3143,17 +3594,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3178,6 +3629,58 @@ msgid ""
 msgstr ""
 "Više knjiga po direktoriju&mu. Podrazumeva da je svaki fajl različita knjiga."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Putanja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr "Kolekcije"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr "Kliknite da biste otvorili"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Nema"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr "Kliknite da otvorite prozor s detaljima o knjizi"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML opcije"
@@ -3237,7 +3740,7 @@ msgstr "izlaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3255,8 +3758,8 @@ msgstr "Opcije za e-knjigu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3974,11 +4477,6 @@ msgstr "Sačuvaj r&azmere naslovne strane"
 msgid "RB Output"
 msgstr "RB izlaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "Izaberite format za prikaz"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -4065,12 +4563,12 @@ msgid "Footer regular expression:"
 msgstr "Regularni izraz za fusnotu:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Neispravan regularni izraz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Neispravan regularni izraz: %s"
 
@@ -4288,11 +4786,19 @@ msgstr ""
 "vidi <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">Uvod u "
 "XPath</a>."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr "Izlog omota nije mogao biti učitan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Pretraži po naslovnim stranama"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4313,234 +4819,264 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr "zvezdica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr "Bez ocene"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr "Ukloni sve etikete"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr "etikete za dodavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr "etikete za uklanjanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Nema detaljnih podataka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "Uređaj više nije priključen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "Prikupi informacije o uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "Preuzmi spisak knjiga sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Preuzmi beleške sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "Pošalji metapodatke na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "Prenesi %d knjiga na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "Izbriši kjnige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "Preuzmi knjige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Pregledaj knjige na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "Postavi podrazumevanu akciju pri prenošenju na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "Pošalji elektronskom poštom na"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr " i izbriši iz biblioteke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "Pošalji u osnovnu memoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "Pošalji na memorijsku karticu A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "Pošalji na memorijsku karticu B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr "Osnovna memorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr "Memorijska kartica A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr "Memorijska kartica B"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr "Pošalji i izbriši iz biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Pošalji određeni format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr "Uspostavi komunikaciju s direktorijumom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr "Prekini komunikaciju s direktorijumom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "Preuzmi beleške (eksperimentalno)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Greška u komunikaciji sa uređajem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr "Izaberite direktorijum koji će biti korišćen kao uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr "Nije uspelo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Greška u komunikaciji sa uređajem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Došlo je do privremene greške u komunikaciji sa uređajem. Molim vas da "
+"isključite uređaj i/ili ponovo pokrenete računar."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Uređaj: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " detektovan."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Priključen je "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "izabrane za slanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Izaberi format za slanje na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Nema uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Ne mogu da pošaljem: Nije priključen nijedan uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Nema memorijske kartice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "Ne mogu da pošaljem: Uređaj nema memorijsku karticu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-knjiga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "E-knjigu ćete pronaći priključenu uz ovu poruku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "u formatu %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Šaljem poruku za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Nema odgovarajućih formata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr "Automatski konvertuj ove knjige pre slanja elektronskom poštom?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nisam uspeo da pošaljem ove knjige, jer nisu pronađeni odgovarajući formati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "Nisam uspeo da pošaljem knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "Nisam uspeo da pošaljem sledeće knjige:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Poslato elektronskom poštom:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Vesti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Priključeno je"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Poslao vesti za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Automatski konvertuj sledeće knjige pre slanja na uređaj?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "Šaljem katalog na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "Šaljem vesti na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Šaljem knjige na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -4549,48 +5085,32 @@ msgstr ""
 "odgovarajući formati. Morate prvo konvertovati knjige u format koji vaš "
 "uređaj podržava."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "Na uređaju nema dovoljno mesta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Ne mogu da prenesem knjige na uređaj, jer nema više slobodnog mesta "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "Izaberi formate koji su na raspolaganju za uređaj, i njihov redosled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Koristi pod-direktorijume"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr "Koristite polje za sortiranje po autoru umesto imena autora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "Šablon za &snimanje:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Putanja"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Formati"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "Prilagodi veličinu &naslovne strane"
@@ -4744,11 +5264,19 @@ msgstr ""
 msgid "new email address"
 msgstr "nova elektronska adresa"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr "Širok"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr "Uzak"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr "Izabran je sistemski port"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -4758,139 +5286,131 @@ msgstr ""
 "port. Vaš operativni sistem <b>može</b> da ne dozvoli serveru da koristi "
 "ovaj port. Da biste bili sigurni izaberite port veći od 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Greška"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "Nisam uspeo da instaliram alate za komandnu liniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "Alati za komandnu liniju su instalirani"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "Alati za komandnu liniju su instalirani u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Ako promenite direktorijum za calibre.app moraćete da ponovo instalirate "
 "alate za komandnu liniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "Ne postoji ispravna putanja do dodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s nije ispravna putanja do dodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "Izaberite dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "Dodatak se ne može isključiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "Dodatak: %s se ne može isključiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "Dodatak nema opcija koje se mogu menjati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "Dodatak: %s ne zahteva podešavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Podesi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "Ne mogu da uklonim ugrađeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " se ne može ukloniti. Ovaj dodatak je ugrađen. Probajte da ga isključite."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr "Da biste izbrisali kolonu morate je prvo izabrati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr "Izabrana kolona nije korisnička kolona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Da li zaista želite da izbrišete kolonu %s i njen sadržaj?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Dnevnik grešaka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Dnevnik pristupa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "Nisam uspeo da pokrenem server sadržaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Izaberite putanju za knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Neispravna veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Veličina %s je neispravna. Mora biti u obliku širinaxvisina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Neispravna lokacija baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Neispravna lokacija baze podataka "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Mora biti direktorijum."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neispravna lokacija baze podataka.<br>Ne mogu da pišem u "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr "Potrebno je ponovno pokretanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4898,19 +5418,19 @@ msgstr ""
 "Izmene koje ste izvršili zahtevaju da ponovo pokrenete Calibre. Molim vas da "
 "to učinite što pre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "Proveravam integritet baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "Neuspešna provera integriteta baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "Pronađene su neke nedoslednosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5045,13 +5565,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Slanje na &uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5059,27 +5580,27 @@ msgstr ""
 "&Mesto za e-knjige (e-knjige se smeštaju u direktorijume sortirane po "
 "autoru, a metapodaci se snimaju u fajl metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "Pronađite novo mesto za bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "Prikaži poruku ako postoji &nova verzija programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Automatski preuzmi &društvene metapodatke (etikete, ocene, itd)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "Automatski &prepiši autora i naslov kada preuzimaš metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "Podrazumevana vrednost za čekanje na odziv &mreže:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5087,140 +5608,148 @@ msgstr ""
 "Postavi podrazumevanu vrednost za čekanje na odziv mreže (t.j. pristup "
 "Internetu radi preuzimanja podataka)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekundi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Izaberi &jezik (zahteva ponovno pokretanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normalan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Visok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Nizak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "&Prioritet posla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Poželjni izlazni f&ormat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "Poželjan redosled ulazn&ih formata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "Koristi &rimske cifre za broj serije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Uključi prikazivanje sis&temske ikone (zahteva ponovno startovanje programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "Prikazuj obaveštenja u sistemskoj ikoni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr "Prikaži &početni ekran pri pokretanju programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Prikaži &izlog naslovnih strana u posebnom prozoru (zahteva ponovno "
 "startovanje programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr "Prik&aži srednje ocene u izlogu etiketa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Pretraga tokom kucanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automatski pošalji preuzete &vesti na čitač"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "&Izbriši vesti iz biblioteke kada budu automatski poslate na čitač"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Broj naslovnih strana koje će biti prikazane u izlogu (zahteva ponovno "
 "startovanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Traka sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Velika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Srednja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Mala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "Veličina &dugmadi u traci sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Prikaži &tekst na dugmadima u traci sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "Izaberi vidljive &kolone u prikazu biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr "Ukloni korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr "Dodaj korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr "Promeni podešavanja za korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Koristi &ugrađeni čitač za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr "Izg&led korisničkog interfejsa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Dodaj elektronsku adresu na koju će se slati knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "&Dodaj elektronsku adresu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Učini &podrazumevanom vrednošću"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "&Ukloni elektronsku adresu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5230,35 +5759,35 @@ msgstr ""
 "Pošta sa preuzetim vestima će biti automatski poslata na sve adrese za koje "
 "ste uključili Automatsko slanje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "&Maksimalan broj radnih procesa u redu za čekanje (zahteva ponovno "
 "startovanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "&Proveri integritet baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "&Instaliraj alatke za komandnu liniju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "Otvori direktorijum koji sadrži calibre &konfiguraciju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Ograniči najveći broj istovremenih poslova na broj raspoloživih &procesora "
 "(ili procesorskih jezgara)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "Traži greške u otkrivanju &uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -5268,25 +5797,25 @@ msgstr ""
 "Interneta. Sve izmene koje ovde unesete će postati aktivne tek posle "
 "ponovnog pokretanja servera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "&Port za server:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Korisničko ime:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Lozinka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5294,7 +5823,7 @@ msgstr ""
 "Ako je polje za lozinku prazno svako će moći da pristupi vašoj biblioteci "
 "preko Interneta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5302,45 +5831,45 @@ msgstr ""
 "Maksimalna veličina (širinaxvisina) za prikaz naslovnih strana. Veće "
 "naslovne strane će biti smanjene. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "Maks. veličina &naslovne strane:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Prikaži lozinku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "Maks. broj &OPDS stavki po upitu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Maks. OPDS negr&upisane stavke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "&Pokreni server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "&Zaustavi server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "&Proveri server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "&Automatski pokreni server pri pokretanju programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Prikaži &serverski dnevnik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5357,7 +5886,7 @@ msgstr ""
 "na vašem iPhoneu. Ovde mojhost treba da bude puno ime ili IP adresa računara "
 "na kojem ste pokrenuli calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5365,27 +5894,27 @@ msgstr ""
 "Ovde možete promeniti ponašanje Calibrea izborom dodataka koji će biti "
 "korišćeni za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "Uključi/&Isključi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "&Podesi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "&Ukloni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "Dodaj novi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "&Fajl sa dodatkom:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -5422,10 +5951,11 @@ msgid "Number"
 msgstr "Broj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
 
@@ -5441,68 +5971,70 @@ msgstr "Objašnjenje teksta dodatog u create_ct_column.py"
 msgid "Create and edit tag-based columns"
 msgstr "Napravi ili popravi kolone zasnovane na etiketama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr "Tekst, kolona prikazana u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr "Tekst razdvojen zarezima, kao i etikete, prikaži u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr "Dugačak tekst, kao i komentari, nije prikazan u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr "Razlomljen broj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr "Celi brojevi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Ocene, prikazane zvezdicama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr "Da/Ne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr "Nije izabrana nijedna kolona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr "Nije izabrana nijedna kolona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr "Izabrana kolona nije korisnička kolona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "Nije navedeno ime za pretragu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
-msgstr "Oznaka mora da se sastoji samo do slova i cifara i da počne slovom"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
+msgstr ""
+"Etiketa sme da sadrži samo slova, cifre i donje crte, a mora početi slovom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr "Nije naveden naziv kolone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr "Ime za pretragu %s je već u upotrebi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr "Naziv %s je već u upotrebi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5626,6 +6158,27 @@ msgstr "&Ponovo prikaži ovo upozorenje"
 msgid "ERROR"
 msgstr "GREŠKA"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr "Lokacija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr "Izbriši sa uređaja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr "Sortiranje po autoru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr "Organizuj autore"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Sortiranje po autoru"
@@ -5850,11 +6403,6 @@ msgstr "Neispravna slika"
 msgid "Choose formats for "
 msgstr "Izaberi formate za "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "Knjige"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Nema dozvole"
@@ -5893,70 +6441,78 @@ msgstr "Naslovna strana u formatu %s je neispravna"
 msgid "Abort the editing of all remaining books"
 msgstr "Prekini obradu svih preostalih knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Ovaj ISBN broj je ispravan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Ovaj ISBN broj je neispravan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr "Ne mogu da koristim uređivač etiketa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr "Ne možete koristiti uređivač etiketa ako ste etikete modifikovali"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Preuzimam naslovnu stranu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Nisam uspeo da preuzmem naslovnu stranu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Nisam uspeo da preuzmem naslovnu stranu.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Preuzimanje je trajalo predugo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 "Nisam uspeo da pronađem naslovnu stranu za ovu knjigu. Probajte da prvo "
 "navedete ISBN broj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Neispravna naslovna strana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Naslovna strana nije ispravna slika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "Bilo je grešaka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "Bilo je grešaka pri preuzimanju društvenih metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Ne mogu da preuzmem metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 "Morate navesti bar jedno od: ISBN broja, naslova, autora, ili izdavača"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Dozvola uskraćena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "Nisam uspeo da otvorim %s. Da li ga koristi neki drugi program?"
 
@@ -6326,12 +6882,12 @@ msgid "Choose formats"
 msgstr "Izaberi formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Autori"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Izdavači"
 
@@ -6454,12 +7010,12 @@ msgstr ""
 "knjigu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr "Ova stavka je prazna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Stavka ne može da bude prazna. Izbrišite je."
 
@@ -6491,15 +7047,15 @@ msgstr "Morate izabrati bar jednu stavku iz liste"
 msgid "Are you certain you want to delete the following items?"
 msgstr "Da li ste sigurni da želite da izbrišete ove stavke?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr "Uređivač kategorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr "Stavke u upotrebi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
@@ -6507,11 +7063,11 @@ msgstr ""
 "Izbriši stavku iz baze podataka. Ovo će prvo ukloniti ovu stavku iz svih "
 "knjiga, a zatim je ukloniti i iz baze podataka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr "Preimenuj stavku u svakoj knjizi koja je koristi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr "Ctrl+S"
 
@@ -6787,11 +7343,11 @@ msgstr "Regularni izraz (?P&lt;naslov&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Ništa nije pronađeno"
 
@@ -6827,54 +7383,208 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regularni izraz (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Snimi samo jedan format na disk..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Izmena pojedinačnih metapodataka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Masovna izmena metapodataka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Preuzmi metapodatke i naslovne strane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Preuzmi samo metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Preuzmi samo naslovne strane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Preuzmi samo društvene metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Spoji u prvu izabranu knjigu - ostale izbriši"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Spoji u prvu izabranu knjigu - ostale zadrži"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Dodaj knjige iz jednog direktorijuma"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Dodaj knjige iz direktorijuma, uključujući i pod-direktorijume (jedna knjiga "
+"po direktorijumu, podrazumeva se da su različiti fajlovi ista knjiga u "
+"različitiim formatima)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Dodaj knjige iz direktorijuma, uključujući pod-direktorijume (više knjiga po "
+"direktorijumu, podrazumeva se da je svaki fajl različita knjiga)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Dodaj praznu knjigu. (Stavka za knjigu bez ijednog formata)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Snimi na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Snimi na disk u jedan direktorijum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Snimi na disk samo %s format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr "Sačuvaj samo format %s na disk u jedan direktorijum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Prikaži"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Prikaži određeni format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Ukloni izabrane knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Ukloni fajlove navedenih formata za izabrane knjige..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Ukloni sve formate za izabrane knjige, osim..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Ukloni naslovne strane izabranih knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr "Ukloni odgovarajuće knjige sa uređaja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Konvertuj pojedinačno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Konvertuj masovno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Napravite katalog knjiga u vašoj calibre biblioteci"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Pokrenite čarobnjaka za dobrodošlicu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Slične knjige..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr "Dodaj knjige u biblioteku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr "Izlog omota"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr "Izlog etiketa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr "Podaci o knjizi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Posao"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Pokazatelj napretka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Vreme izvršavanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "Ima %d aktivnih poslova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Nepoznat posao"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "Ima %d poslova na čekanju:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Ne mogu da prekinem posao"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Ne mogu da prekinem posao koji komunicira sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Posao je već završen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Nedostupan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Poslovi:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Kliknite da vidite spisak aktivnih poslova."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Poslova"
 
@@ -6886,112 +7596,90 @@ msgstr "N"
 msgid "Y"
 msgstr "Y"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr "Na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Veličina (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Nema"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> autora %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr "Ime za pretragu je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "U biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr "Veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr "Kolekcije"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr "Izabrano za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknite dva puta da me <b>promenite</b><br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr "Sakrij kolonu %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr "Sortiraj po koloni %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr "Rastući redosled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr "Opadajući redosled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr "Promeni poravnanje za %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr "Levo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr "Desno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr "Centrirano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr "Prikaži kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr "Vrati podrazumevani izgled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "Nije dozvoljeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7090,54 +7778,55 @@ msgstr "Piši izveštaje o greškama na konzolu"
 msgid "Do not check for updates"
 msgstr "Ne proveravaj postojanje novije verzije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr "Izaberite mesto za vašu biblioteku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr "Nisam uspeo da napravim biblioteku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "Nisam uspeo da napravim biblioteku u: %r. Prekidam."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr "Pokrećem korisnički interfejs..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr "Popravka neuspela"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-"Popravka baze podataka nije uspela. Počeću s novom, praznom, bibliotekom."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Calibre biblioteka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr "Izaberite mesto za vašu biblioteku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr "Nisam uspeo da napravim biblioteku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr "Nisam uspeo da napravim biblioteku na: %r."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr "Izaberite mesto za vašu novu calibre biblioteku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr "Pokrećem korisnički interfejs..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr "Popravka neuspela"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+"Popravka baze podataka nije uspela. Počeću s novom, praznom, bibliotekom."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Neispravna lokacija za bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr "Neispravno mesto za bazu podataka %r. calibre će sada prekinuti rad."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "Neispravna baza podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
@@ -7147,89 +7836,89 @@ msgstr ""
 "pokuša da je automatski popravi? Ako odgovorite Ne biće napravljena nova, "
 "prazna, biblioteka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 "Popravljam bazu podataka. Ovo može trajati vrlo dugo ako je vaša kolekcija "
 "velika."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 "Neispravno mesto za bazu podataka, %r. Počeću s novom, praznom calibre "
 "bibliotekom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr "Pokrećem %s: Učitavam knjige..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "Ako ste sigurni da nije pokrenut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Ne mogu da pokrenem "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s je već pokrenut."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "i možda je sakriven u sistemsk ikonu, u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "gornjem desnom uglu ekrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "donjem desnom uglu ekrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "pokušajte da ponovo pokrenete računar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "pokušajte da izbrišete fajl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr "Og&raniči na:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 "Prikaz knjiga će bit ograničen na knjige koje odgovaraju sačuvanoj pretrazi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "podesi u ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Napredna pretraga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Traži:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -7237,146 +7926,116 @@ msgstr ""
 "<p>Pretraži spisak knjiga po naslovu, autoru, izdavaču, etiketama, "
 "komentarima, itd.<br><br>Reči razdovjene razmacima moraju SVE biti prisutne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Poništi brzu pretragu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr "Izaberite sačuvanu pretragu, ili unesite ime za novu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "Kopirajte tekst koji se trenutno traži (umesto imena pretrage)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "Sačuvajte trenutnu pretragu pod imenom prikazanim u polju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Izaberi aktivnu sačuvanu pretragu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "Sortiraj po &popularnosti"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "Odgovara bilo koji od"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "Moraju odgovarati svi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr "Kreiraj, promeni, ili izbriši korisničke kategorije"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr "&Uredi korisničke kategorije"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Dodaj knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Ukloni knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Izmeni metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr "Spoj odrednice s knjigama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Pošalji na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Snimi na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Preuzmi vesti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "Konvertuj e-knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Prikaži"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "Otvori izvorni direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Prikaži detalje o knjizi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Knjige od istog autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Knjige iz iste serije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Knjige od istog izdavača"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "Knjige sa istim etiketama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "Podesi calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7408,15 +8067,35 @@ msgstr "Knjiga nema ni naslov ni ISBN broj"
 msgid "No matches found for this book"
 msgstr "Nema rezultata za ovu knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Traži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr "Izabrana pretraga će bit <b>izbrisana zauvek</b>. Da li ste sigurni?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Traži (za naprednu pretragu kliknite dugme levo)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Sačuvane pretrage"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr "({0} od {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(sve knjige)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr "({0} od svih)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Pritisni dirku..."
@@ -7477,83 +8156,76 @@ msgstr "Obriši"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativna prečica:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Poslovi:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
+msgstr "Preimenuj '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Kliknite da vidite spisak aktivnih poslova."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
+msgstr "Izmeni način sortiranja za '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr "Sakrij detalje o knjizi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr "Prikaži detalje o knjizi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr "Sakrij izlog etiketa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr "Prikaži izlog etiketa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr "Sakrij izlog omota"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr "Prikaži izlog omota"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr "Bočna traka"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr "Nisam uspeo da učitam izlog omota: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr "Preimenuj"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr "Sakrij kategoriju %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr "Prikaži kategoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr "Prikaži sve kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
-msgstr "Uredi "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
+msgstr "Uredi '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr "Uredi sačuvane pretrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr "Uredi korisničke kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Pretrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
-msgstr "Ime %s je već u upotrebi."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Naziv pretrage već postoji"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "Naziv sačuvane pretrage %s je već u upotrebi."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr "Sortiraj po imenu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr "Sortiraj po popularnosti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr "Sortiraj po srednjoj oceni"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Moraju odgovarati svi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Odgovara bilo koji od"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "&Uredi korisničke kategorije"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -7598,612 +8270,62 @@ msgstr ""
 "Ove knjige su već konvertovane u format %s. Da li želite da ih ponovo "
 "konvertujete?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Snimi samo jedan format na disk..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Traži (za naprednu pretragu kliknite dugme levo)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Sačuvane pretrage"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Greška u komunikaciji sa uređajem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "V&rati na ekran"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "Pošaljite &donaciju da podržite razvoj calibre programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "Isključi pov&ezani uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "&Ponovo pokreni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>Za pomoć vidi: <a href=\"%s\">Korisničko uputstvo</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s autor <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Izmena pojedinačnih metapodataka"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Masovna izmena metapodataka"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Preuzmi metapodatke i naslovne strane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Preuzmi samo metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Preuzmi samo naslovne strane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Preuzmi samo društvene metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Spoji u prvu izabranu knjigu - ostale izbriši"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Spoji u prvu izabranu knjigu - ostale zadrži"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Dodaj knjige iz jednog direktorijuma"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Dodaj knjige iz direktorijuma, uključujući i pod-direktorijume (jedna knjiga "
-"po direktorijumu, podrazumeva se da su različiti fajlovi ista knjiga u "
-"različitiim formatima)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Dodaj knjige iz direktorijuma, uključujući pod-direktorijume (više knjiga po "
-"direktorijumu, podrazumeva se da je svaki fajl različita knjiga)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Dodaj praznu knjigu. (Stavka za knjigu bez ijednog formata)."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Snimi na disk u jedan direktorijum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "Snimi na disk samo %s format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr "Sačuvaj samo format %s na disk u jedan direktorijum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Prikaži određeni format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Ukloni izabrane knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Ukloni fajlove navedenih formata za izabrane knjige..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Ukloni sve formate za izabrane knjige, osim..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Ukloni naslovne strane izabranih knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Konvertuj pojedinačno"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Konvertuj masovno"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Napravite katalog knjiga u vašoj calibre biblioteci"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Pokrenite čarobnjaka za dobrodošlicu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Slične knjige..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Kratko uputstvo za Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr "Izaberite direktorijum koji će biti korišćen kao uređaj"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "Pretraži po naslovnim stranama"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr "({0} od {1})"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "(sve knjige)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr "({0} od svih)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "Uređaj: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " detektovan."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "Priključen je "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "Baza podatak uređaja je neispravna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>Baza podatak uređaja je neispravna. Pokušajte nešto od "
-"sledećeg:\n"
-"                <ol>\n"
-"                <li>Isključite uređaj sa računara. Sačekajte da uređaj "
-"završi osvežavanje svoje baze podataka (tj. sačekajte da ponovo bude spreman "
-"za upotrebu). Ponovo ga priključite na računar. Sada bi trebalo da radi sa "
-"%(app)s. Ako ne, pokušajte sledeći korak.</li>\n"
-"                <li>Izađite iz %(app)s. Pronađite fajl media.xml u osnovnoj "
-"memoriji uređaja. Izbrišite ga. Isključite uređaj sa računara. Sačekajte da "
-"ponovo napravi ovaj fajl. Ponovo ga povežite i pokrenite %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "Koristi samo biblioteku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "Koristite samo beleške iz glavne biblioteke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "Nije izabrana nijedna knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr "Nije izabrana nijedna knjiga za preuzimanje beleški"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "Dodaj korisničke beleške u bazu podataka"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Poslednja pročitana strana: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Poslednja pročitana strana: Lokacija %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Lokacija %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Strana %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Lokacija %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "Koliko praznih knjiga?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "Koliko praznih knjiga treba da se doda?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "Prenosim knjige na uređaj."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr "Topaz knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "Knijge u tekst formatu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "Stripovi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "Arhive"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "Podržane knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "Dodao sam neke knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Pronađeni su neki duplikati i dodati sledećim već postojećim knjigama:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "Nisam uspeo da pročitam metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "Nisam upseo da pročitam metapodatke iz"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "Ne mogu da obrišem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "Nije izabrana nijedna knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "Izaberite formate za brisanje"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "Izaberite formate koji <b>neće</b> biti obrisani"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"Izabrane knjige će biti <b>obrisane zauvek</b> i fajlovi uklonjeni s vašeg "
-"računara. Da li ste sigurni?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-"Izabrane knjige će biti <b>zauvek izbrisane</b> s vašeg uređaja. Da li ste "
-"sigurni?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "Brišem knjige sa uređaja."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "Ne mogu da preuzmem metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "društveni metapodaci"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "naslovne strane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "metapodaci"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "Preuzimam %s za %d knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "Nisam uspeo da preuzmem neke metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "Nisam uspeo da preuzmem metapodatke za:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "Nisam uspeo da preuzmem metapodatke:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "Ne mogu da promenim metapodatke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "Ne mogu da spojim knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "Za spajanje je potrebno izabrati bar dve knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-"Svi formati i metapodaci iz izabranih knjiga će biti dodati <b>prvoj "
-"izabranoj knjizi.</b><br><br> Druga i ostale izabrane knjige neće biti "
-"izbrisane niti promenjene.<br><br>Molim vas da potvrdite da želite da "
-"nastavite"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-"Svi formati i metapodaci iz izabranih knjiga će biti dodati <b>prvoj "
-"izabranoj knjizi.</b><br><br> Posle spajanja, druga i ostale izabrane knjige "
-"će biti <b>izbrisane</b>. <br><br>Svi formati prve izabrane knjige će biti "
-"sačuvani, a svi duplikati formata u drugoj i ostalim izabranim knjigama će "
-"biti trajno <b>izbrisani</b> sa vašeg računara.<br><br>Da li ste "
-"<b>sigurni</b> da želite da nastavite?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Pripremili ste se za spajanje više od 5 kjniga. Da li ste <b>sigurni</b> da "
-"želite da nastavite?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Ne mogu da snimim na disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "Promeni ciljni direktorijum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "Greška pri snimanju"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "Došlo je do greške pri snimanju."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "Nisam uspeo da snimim neke knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "Kliknite na dugme za više detalja da vidite koje."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "Nema knjiga za koje bi se kreirao katalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "Kreiram katalog %s..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"Nema knjiga za katalog\n"
-"Proverite ignorisane etikete"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "Katalog je kreiran."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "Direktorijum za izvoz kataloga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "Izaberi odredište za %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "Preuzimam vesti sa "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " preuzeto."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "Ne mogu da konvertujem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "Počinjem konverziju %d knjiga."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "Nemoguće pregledati"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "Izabrano je više knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-"Pokušavate da otvorite %d knjiga. Otvaranje previše knjiga odjednom može da "
-"bude sporo i ima negativan uticaj na brzinu odziva vašeg računara. Jednom "
-"započet, ovaj proces se ne može prekinuti pre završetka. Da li želite da "
-"nastavite?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "Ne mogu da otvorim direktorijum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s nema raspoloživih formata."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Ne mogu da podesim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Ne mogu da podesim dok ima aktivnih poslova."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr "Ne mogu da podesim dok ponovo ne pokrenete calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Ne postoje detaljne informacije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "Ne postoje detaljne informacije za knjige na uređaju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr "Nije uspelo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "Greška u komunikaciji sa uređajem"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Došlo je do privremene greške u komunikaciji sa uređajem. Molim vas da "
-"isključite uređaj i/ili ponovo pokrenete računar."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "Greška u konverziji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8211,15 +8333,15 @@ msgstr ""
 "<p>Nisam uspeo da konvertujem: %s<p>Knjiga je zaštićena <a "
 "href=\"%s\">DRM</a>om. Prvo morate ukloniti DRM nezavisnim alatima."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Recept je isključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -8228,12 +8350,12 @@ msgstr ""
 "mislite da je koristan molim vas da razmotrite donaciju kako bi podržali "
 "dalji razvoj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Još uvek ima aktivnih poslova. Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8244,11 +8366,11 @@ msgstr ""
 "uređaju.<br>\n"
 "                      Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "UPOZORENJE: Aktivni poslovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8256,7 +8378,7 @@ msgstr ""
 "će nastaviti da radi kao sistemska ikona. Da prekinete rad izaberite "
 "<b>Izlaz</b> u meniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8264,11 +8386,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Najnovija verzija: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "Nova verzija je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8748,15 +8870,15 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Štampaj e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Kopiraj sliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Ubaci sliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8766,7 +8888,7 @@ msgstr ""
 "%d\n"
 "knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8776,7 +8898,7 @@ msgstr ""
 "%s\n"
 "je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8786,7 +8908,7 @@ msgstr ""
 "%s\n"
 "je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8796,52 +8918,64 @@ msgstr ""
 "%s\n"
 "je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Kliknite da vidite koje knjige su na raspolaganju na vašem računaru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 "Kliknite da vidite koje knjige su na raspolaganju u osnovnoj memoriji vašeg "
 "čitača"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 "Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici A "
 "vašeg čitača"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 "Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici B "
 "vašeg čitača"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr "Knjige se nalaze u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Promeni veličinu slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "Velika slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "Mala slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Zameni velika slova u mala, i obrnuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Veličina slova za naslov"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr "Povuci za promenu veličine"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr "Prikaži"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr "Sakrij"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -9144,48 +9278,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Uključite &server sadržaja"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr "danas"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr "juče"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr "ovog meseca"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr "dana ranije"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr "ne"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr "neobeleženo"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr "obeleženo"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr "da"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr "prazno"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr "prazno"
 
@@ -9698,7 +9832,7 @@ msgstr ""
 "Podrazumeva se: bez filtriranja"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Prikaži detaljne informacije. Korisno za traženje grešaka"
 
@@ -9810,44 +9944,48 @@ msgstr ""
 "\n"
 "Za pomoć vidite: %%prog komanda --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr "%sSrednja ocena je %3.1f"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr "Osnovna"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr "Kartica A"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr "Kartica B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Prevodim staru bazu podataka u biblioteku e-knjiga u %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "Kopiram <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "Sažimam bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "Proveravam ispravnost SQLa..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "Tražim nepostojeće fajlove."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "Proverio identifikator"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Ocene"
 
@@ -10070,43 +10208,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr "Upiši PID procesa u navedeni fajl"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr "%d knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr "%d stavki."
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "OCENA: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr "ETIKETE: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "SERIJA: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Biblioteka"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Knjige u vašoj biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr "Od autora "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr "Knjige sortirane po "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr "Najnovije"
 
@@ -10253,34 +10391,38 @@ msgid "English (Pakistan)"
 msgstr "Engleski (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr "Engleski (Izrael)"
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Engleski (Singapur)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "Engleski (Jemen)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "Engleski (Irska)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Engleski (Kina)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Španski (Paragvaj)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Nemački (Austrija)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Holandski (Holandija)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Holandski (Belgija)"
 
@@ -10341,93 +10483,93 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr "Ne preuzimaj najnoviju verziju ugrađenih recepata sa calibre servera"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Nepoznat izvor vesti"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Recept \"%s\" zahteva korisničko ime i lozinku"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Preuzimanje gotovo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "Nisam uspeo da preuzmem sledeće članke:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "Nisam uspeo da preuzmem delove sledećih članaka:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " sa "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tNeuspele veze:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Nisam mogao da preuzmem članak. Probajte ponovo sa opcijom -vv da biste "
 "saznali razlog"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Preuzimam izvore..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "Dobio sam izvore s osnovne strane..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Pokušavam da preuzmem naslovnu stranu..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "Generišem impresum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "Počinjem preuzimanje [%d niti]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "Izvori su preuzeti u %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "Nisam uspeo da preuzmem naslovnu stranu: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "Preuzimam naslovnu stranu sa %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "Preuzeo sam sliku za impresum"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Članak bez imena"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "Preuzeo sam članak: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "Nije uspelo preuzimanje članka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Preuzimam izvor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10435,7 +10577,7 @@ msgstr ""
 "Neuspelo prijavljivanje. Proverite korisničko ime i lozinku vašeg calibre "
 "servisa za periodiku."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10458,7 +10600,7 @@ msgstr "Planirano"
 msgid "Custom"
 msgstr "Po meri"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10468,24 +10610,24 @@ msgstr ""
 "\n"
 "Gde je URL na primer http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Osnovni direktorijum u koji će biti snimljen URL. Podrazumeva se %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "Broj sekundi za čekanje na odziv servera. Podrazumeva se %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr "Najveća dubina rekurzije, tj. praćenja veza. Podrazumeva se %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10493,7 +10635,7 @@ msgstr ""
 "Najveći broj fajlova koji će biti preuzet. Ovo se odnosi samo na fajlove u "
 "<a href> odrednicama. Podrazumeva se %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10501,7 +10643,7 @@ msgstr ""
 "Najmanji razmak, u sekundama, između uzastopnih preuzimanja. Podrazumeva se "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10509,7 +10651,7 @@ msgstr ""
 "Kodni raspored Internet sajtova sa kojih pokušavate preuzimanje. Podrazumeva "
 "se da će biti pokušan da bude određen automatski."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -10520,7 +10662,7 @@ msgstr ""
 "može da se pronađe bar jedan regularni izraz kome odgovaraju. Podrazumeva se "
 "da će se pratiti sve veze."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10534,7 +10676,7 @@ msgstr ""
 "biti ignorisana nijedna veza. Ako se navedu i --filter-regexp i --match-"
 "regexp, prvo će se primeniti --filter-regexp."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "Ne preuzimaj CSS stilove."
 
@@ -10547,6 +10689,9 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "dummy option until real options are determined."
 #~ msgstr "privremena opcija dok ne odredimo prave opcije."
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Sortiraj etikete po popularnosti"
+
 #~ msgid "No text &justification"
 #~ msgstr "Ne &poravnavaj redove"
 
@@ -10568,9 +10713,15 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Send specific format to main memory"
 #~ msgstr "Pošalji određeni format u osnovnu memoriju"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "Sortiraj po &popularnosti"
+
 #~ msgid "Click to browse books by their covers"
 #~ msgstr "Kliknite da izaberete knjigu po naslovnoj strani"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Baza podatak uređaja je neispravna"
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Izaberite lokaciju za vašu biblioteku e-knjiga."
 
@@ -10619,6 +10770,34 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Click to browse books by tags"
 #~ msgstr "Kliknite da tražite knjige po etiketama"
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>Baza podatak uređaja je neispravna. Pokušajte nešto od "
+#~ "sledećeg:\n"
+#~ "                <ol>\n"
+#~ "                <li>Isključite uređaj sa računara. Sačekajte da uređaj "
+#~ "završi osvežavanje svoje baze podataka (tj. sačekajte da ponovo bude spreman "
+#~ "za upotrebu). Ponovo ga priključite na računar. Sada bi trebalo da radi sa "
+#~ "%(app)s. Ako ne, pokušajte sledeći korak.</li>\n"
+#~ "                <li>Izađite iz %(app)s. Pronađite fajl media.xml u osnovnoj "
+#~ "memoriji uređaja. Izbrišite ga. Isključite uređaj sa računara. Sačekajte da "
+#~ "ponovo napravi ovaj fajl. Ponovo ga povežite i pokrenite %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid "(%d found)"
 #~ msgstr "(pronađeno %d)"
 
@@ -10648,3 +10827,46 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ "Vrednost <b>%d</b> koju ste izabrali za port servera sadržaja je sistemski "
 #~ "port. Vaš operativni sistem <b>možda</b> ne dozvoljava serveru da koristi "
 #~ "ovaj port. Za svaki slučaj izaberite port veći od 1024."
+
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr "Nisam uspeo da napravim biblioteku u: %r. Prekidam."
+
+#~ msgid ""
+#~ "The label must contain only letters and digits, and start with a letter"
+#~ msgstr "Oznaka mora da se sastoji samo do slova i cifara i da počne slovom"
+
+#~ msgid "Create, edit, and delete user categories"
+#~ msgstr "Kreiraj, promeni, ili izbriši korisničke kategorije"
+
+#~ msgid "Show Tag Browser"
+#~ msgstr "Prikaži izlog etiketa"
+
+#~ msgid "Hide Tag Browser"
+#~ msgstr "Sakrij izlog etiketa"
+
+#~ msgid "Show Book Details"
+#~ msgstr "Prikaži detalje o knjizi"
+
+#~ msgid "Hide Book Details"
+#~ msgstr "Sakrij detalje o knjizi"
+
+#~ msgid "Hide Cover Browser"
+#~ msgstr "Sakrij izlog omota"
+
+#~ msgid "Side bar"
+#~ msgstr "Bočna traka"
+
+#~ msgid "Cover browser could not be loaded: "
+#~ msgstr "Nisam uspeo da učitam izlog omota: "
+
+#~ msgid "Show Cover Browser"
+#~ msgstr "Prikaži izlog omota"
+
+#~ msgid "Rename"
+#~ msgstr "Preimenuj"
+
+#~ msgid "The name %s is already used."
+#~ msgstr "Ime %s je već u upotrebi."
+
+#~ msgid "Manage "
+#~ msgstr "Uredi "
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index 7c7beef8d8..1c05ca5eca 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,15 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-05 01:06+0000\n"
-"PO-Revision-Date: 2010-06-04 16:53+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:15+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: SWEDEN\n"
+"X-Poedit-Language: Swedish\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
@@ -23,11 +25,12 @@ msgstr "Gör ingenting"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -39,22 +42,22 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -100,44 +103,46 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:358
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:986
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1797
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:308
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:320
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:884
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:921
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1400
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1402
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1524
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -173,16 +178,16 @@ msgid ""
 "library."
 msgstr ""
 "Följ alla lokala länkar i en HTML-fil och skapa en ZIP-fil som innehåller "
-"alla länkade filer. Denna insticksmodul körs varje gång du lägger till en "
-"HTML-fil till biblioteket."
+"alla länkade filer. Detta tillägg körs varje gång du lägger till en HTML-fil "
+"till biblioteket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:50
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr ""
-"Teckenkodning för infiler i HTML. Gemensamma alternativ inkluderar: cp1252, "
-"latin1, iso-8859-1 och UTF-8."
+"Teckenkodning för indata i HTML. Vanliga alternativ är: cp1252, latin1, iso-"
+"8859-1 och utf-8."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:57
 msgid ""
@@ -191,8 +196,8 @@ msgid ""
 "file to the library."
 msgstr ""
 "Skapa ett PMLZ-arkiv som innehåller PML-filen och alla bilder i katalogen "
-"pmlname_img eller bilder. Denna insticksmodul körs varje gång du lägger till "
-"en PML-fil till biblioteket."
+"pmlname_img eller bilder. Detta tillägg körs varje gång du lägger till en "
+"PML-fil till biblioteket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
@@ -217,7 +222,7 @@ msgstr "Extrahera omslag från serietidningsfiler"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:296
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:306
 msgid "Read metadata from %s files"
-msgstr "Läs metadata från %s filer"
+msgstr "Läs metadata från %s-filer"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
@@ -234,11 +239,11 @@ msgstr "Läs metadata från eböcker i ZIP-arkiv"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:381
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:391
 msgid "Set metadata in %s files"
-msgstr "Ställ in metadata till %s filer"
+msgstr "Ställ in metadata i %s-filer"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
-msgstr "Ställ in metadata från %s filer"
+msgstr "Ställ in metadata utifrån %s-filer"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
@@ -264,20 +269,20 @@ msgid ""
 "If specified, the output plugin will try to create output that is as human "
 "readable as possible. May not have any effect for some output plugins."
 msgstr ""
-"Om detta anges, kommer insticksmodulen att försöka skapa utskrifter som är "
-"så läsbara som möjligt. Detta kanske inte har någon effekt för vissa "
-"insticksmodulers utdata."
+"Om detta anges, kommer tillägget att försöka skapa utskrifter som är så "
+"läsliga som möjligt. Detta kanske inte har någon effekt för vissa tilläggs "
+"utdata."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
-msgstr "Ingångsprofil"
+msgstr "Profil för indata"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49
 msgid ""
 "This profile tries to provide sane defaults and is useful if you know "
 "nothing about the input document."
 msgstr ""
-"Denna profil försöker ange lämpliga grundinställningar och är användbar om "
+"Denna profil försöker ange lämpliga grundinställningar och kan användas om "
 "du inte vet något om ingångsdokumentet."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
@@ -291,62 +296,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Denna profil är avsedd för Sony PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Denna profil är avsedd för Sony PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Denna profil är avsedd för Microsoft Reader."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Denna profil är avsedd för Mobipocket-böcker."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Denna profil är avsedd för Hanlin V3 och dess varianter."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Denna profil är avsedd för Hanlin V5 och dess varianter."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Denna profil är avsedd för Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Denna profil är avsedd för Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Denna profil är avsedd för Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Denna profil är avsedd för Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Denna profil är avsedd för IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Denna profil är avsedd för Irex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Denna profil är avsedd för B&N Nook."
 
@@ -360,7 +365,7 @@ msgid ""
 "produce a document intended to be read at a computer or on a range of "
 "devices."
 msgstr ""
-"Den här profilen försöker ange lämpliga grundinställningar och är användbar "
+"Den här profilen försöker ange lämpliga grundinställningar och kan användas "
 "om du vill skapa en handling som skall läsas på en dator eller på en rad "
 "olika enheter."
 
@@ -371,53 +376,57 @@ msgstr "Avsedd för iPad och liknande enheter med en upplösningen 768x1024"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 msgid "This profile is intended for the Kobo Reader."
-msgstr "Denna profil är avsedd för Kobo läsaren."
+msgstr "Denna profil är avsedd för Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Denna profil är avsedd för SONY PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
-msgstr "Denna profil är avsedd för 5-tums JetBook."
+msgstr "Denna profil är avsedd för JetBook (5 tum)."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
-"Denna profil är avsedd för Sonys PRS-linje: Den 500/505/700 m.fl, i liggande "
+"Denna profil är avsedd för Sonys PRS-linje, 500/505/700 m.fl, i liggande "
 "format. Används främst för serietidningar."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Denna profil är avsedd för Amazon Kindle DX."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
-msgstr "Installerade insticksmoduler"
+msgstr "Installerade tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
-msgstr "Koppling för instickmodulfiltyper"
+msgstr "Kopplingar mellan tillägg och filändelser"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
-msgstr "Lokal insticksmodulsanpassning"
+msgstr "Anpassa tillägg lokalt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
-msgstr "Inaktiverade insticksmoduler."
+msgstr "Inaktiverade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
-msgstr "Ingen giltig insticksmodul funnen i "
+msgstr "Inget giltigt tillägg hittades i "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr "Initialisering av insticksmodul %s misslyckades med följande orsak:"
+msgstr "Tillägget %s kunde inte startas. Information om felet:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -426,40 +435,39 @@ msgid ""
 msgstr ""
 "    %prog tillval\n"
 "\n"
-"    Anpassa calibre genom att ladda externa insticksmoduler.\n"
+"    Anpassa calibre genom att ladda externa tillägg.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
-"Lägg till en insticksmodul genom att ange sökvägen till zip-filen som "
-"innehåller denna."
+"Installera ett tillägg genom att ange sökvägen till zip-filen som innehåller "
+"detta."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
-"Bort en anpassad insticksmodul med avseende på namn. Har ingen effekt på "
-"inbyggda insticksmoduler"
+"Ta bort ett tillägg utifrån dess namn. Har ingen effekt på inbyggda tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
-"Anpassa insticksmodulen. Ange namn på insticksmodulen och anpassa strängen "
-"åtskiljt av ett kommatecken."
+"Anpassa tillägg. Ange tilläggets namn och anpassningssträngen åtskilda av "
+"ett kommatecken."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
-msgstr "Lista alla installerade insticksmoduler"
+msgstr "Lista alla installerade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
-msgstr "Aktivera namngiven insticksmodul"
+msgstr "Aktivera namngivet tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
-msgstr "Avaktivera namngiven insticksmodul"
+msgstr "Inaktivera namngivet tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
@@ -470,40 +478,39 @@ msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used"
 msgstr ""
-"Kommaseparerad lista av kataloger för att skicka e-böcker till på enheten. "
-"Den första som finns kommer att användas"
+"Kommaseparerad lista av kataloger på enheten dit e-böckerna skall skickas. "
+"Den första katalog som finns kommer att användas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "Kommunicera med S60-telefoner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr "Kommunicera med iBook via iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "pple-enhet identifieras, starta iTunes, var god vänta ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:125
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:143
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:146
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "Uppdaterar metadata på enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:211
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:242
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:827
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:964
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr "slutförda"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -513,17 +520,17 @@ msgstr ""
 "Ta bort med hjälp av iBook app.\n"
 "Klicka på \"Visa detaljer\" för en lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
-msgstr "inställningar för drivrutiner"
+msgstr "konfigurera drivrutiner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
-msgstr "Ordnad lista av format enheten kommer att acceptera"
+msgstr "Sorterad lista av format som enheten kommer att acceptera"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -531,13 +538,25 @@ msgstr ""
 "En del omslag kan inte konverteras.\n"
 "Klicka på \"Visa detaljer\" för en lista."
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Nyheter"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
-msgstr "Kommunicera med Binatone Readme e-boksläsare."
+msgstr "Kommunicera med läsplattan Binatone Readme."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
-msgstr "Kommunicera med Blackberry smart phone."
+msgstr "Kommunicera med Blackberry-telefoner."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
@@ -547,11 +566,15 @@ msgstr "Kovid Goyal"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
-msgstr "Kommunicera med Cybook Gen 3 / Opus eboksläsare."
+msgstr "Kommunicera med läsplattan Cybook Gen 3 / Opus."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
-msgstr "Kommunicera med Binatone Readme e-boksläsare."
+msgstr "Kommunicera med läsplattan Binatone Readme."
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
@@ -563,7 +586,11 @@ msgstr "Kommunicera med Entourage Edge."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
-msgstr "Kommunicera med ESlick e-boksläsare."
+msgstr "Kommunicera med läsplattan ESlick."
+
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Kommunicera med läsplattan Sigmatek"
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
@@ -577,27 +604,33 @@ msgstr "Enhetsgränssnitt"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Kommunicera med Hanlin V3 e-boksläsare."
+msgstr "Kommunicera med läsplattan Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Kommunicera med Hanlin V5 e-boksläsare."
+msgstr "Kommunicera med läsplattan Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
-msgstr "Kommunicera med BOOX e-boksläsare."
+msgstr "Kommunicera med läsplattan BOOX."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Kommunicera med Hanvon N520 e-boksläsare."
+msgstr "Kommunicera med läsplattan Hanvon N520."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
 msgid "Communicate with The Book reader."
-msgstr "Kommunicera med The Book läsaren."
+msgstr "Kommunicera med läsplattan The Book."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "Kommunicera med SpringDesign Alex eBokläsare"
+msgstr "Kommunicera med läsplattan SpringDesign Alex."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
 msgid "Communicate with the Azbooka"
@@ -605,21 +638,21 @@ msgstr "Kommunicera med Azbooka"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
 msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Kommunicera med Elonex EB 511 eboksläsare."
+msgstr "Kommunicera med läsplattan Elonex EB 511."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
 msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Kommunicera med IRex Iliad e-boksläsare."
+msgstr "Kommunicera med läsplattan IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
-msgstr "Copy text   \t John Schember"
+msgstr "John Schember"
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
-msgstr "Kommunicera med IRex Digital Reader 1000 e-boksläsare."
+msgstr "Kommunicera med läsplattan IRex Digital Reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
@@ -627,27 +660,27 @@ msgstr "Kommunicera med iRex Digital Reader 800"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
-msgstr "Kommunicera med Iriver Story e-boksläsare."
+msgstr "Kommunicera med läsplattan Iriver Story."
 
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
-msgstr "Kommunicera med JetBook e-boksläsare."
+msgstr "Kommunicera med läsplattan JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
-msgstr "Kommunicera med Kindle e-boksläsare."
+msgstr "Kommunicera med läsplattan Kindle."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
-msgstr "Kommunicera med Kindle 2 e-boksläsare."
+msgstr "Kommunicera med läsplattan Kindle 2."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
-msgstr "Kommunicera med Kindle DX e-boksläsare."
+msgstr "Kommunicera med läsplattan Kindle DX."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
-msgstr "Kommunicera med Kobo läsaren"
+msgstr "Kommunicera med läsplattan Kobo"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
@@ -659,11 +692,11 @@ msgstr "Kommunicera med Booq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
-msgstr "Kommunicera med Nokia 770 internet tablet."
+msgstr "Kommunicera med surfplattan Nokia 770."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
-msgstr "Kommunicera med Nokia 810 internet tablet."
+msgstr "Kommunicera med surfplattan Nokia 810."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
@@ -671,17 +704,17 @@ msgstr "Nook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
-msgstr "Kommunicera med Nook e-boksläsare."
+msgstr "Kommunicera med läsplattan Nook."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
-msgstr "Kommunicera med Nuut2 e-boksläsare."
+msgstr "Kommunicera med läsplattan Nuut2."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
-msgstr "Kommunicera med Sony PRS-500 e-boksläsare."
+msgstr "Kommunicera med läsplattan Sony PRS-500."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunicera med alla Sony eboksläsare."
 
@@ -690,86 +723,75 @@ msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
-"Kommaseparerad lista av metadatafält att förvandlas till samlingar på "
-"enheten. Möjligheter omfattar: "
+"Kommaseparerad lista av metadatafält att förvandla till samlingar på "
+"enheten. Möjliga alternativ är: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "Namnlös"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
-msgstr "Kommunicera med Samsung SNE eBokläsare"
+msgstr "Kommunicera med läsplattan Samsung SNE."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
-msgstr "Kommunicera med Teclast K3 läsaren."
+msgstr "Kommunicera med läsplattan Teclast K3."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
-msgstr "Kommunicera med Newsmy reader."
+msgstr "Kommunicera med läsplattan Newsmy."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
-msgstr "Kommunicera med iPapyrus reader."
+msgstr "Kommunicera med läsplattan iPapyrus."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
-msgstr "Det går inte att upptäcka %s hårddisken. Prova omstart."
+msgstr "Kunde inte hitta hårddisken %s . Prova att starta om datorn."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
-msgstr "Det går inte att upptäcka %s monteringspunkten. Prova omstart."
+msgstr "Kunde inte hitta monteringspunkten %s. Prova att starta om datorn."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
-msgstr "Det går inte att upptäcka %s hårddisken."
+msgstr "Kunde inte hitta hårddisken %s ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Kunde inte hitta montera hjälpen: %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
-"Det går inte att upptäcka %s hårddisken. Din kärna exporterar förmodligen en "
-"ogiltig version av SYSFS."
+"Kunde inte hitta hårddisken %s . Din kärna exporterar förmodligen en ogiltig "
+"version av SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
-msgstr "Det går inte att montera primärminne (Felkod: %d)"
+msgstr "Kunde inte montera enhetens inbyggda minne (Felkod: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "Läsaren har inget minneskort i kortplatsen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
-msgstr "Vald kortplats: %s stöds inte."
+msgstr "Vald kortplats - %s - stöds inte."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
-msgstr "Det finns tillräckligt med ledigt utrymme i primärminnet"
+msgstr "Det finns inte tillräckligt med plats i enhetens inbyggda minne"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
-msgstr "Det finns tillräckligt mycket ledigt utrymme på minneskortet"
-
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:147
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:158
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Nyheter"
+msgstr "Det finns tillräckligt med plats på minneskortet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
@@ -780,57 +802,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Placera filer i underkataloger om enheten stöder dem"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Läs metadata från filer på enheten"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Mall för att kontrollera hur böcker sparas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Extra anpassning"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
-msgstr "Kommunicera med en e-boksläsare."
+msgstr "Kommunicera med en läsplatta."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Hämta enhetsinformation..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
-msgstr "Hämta lista över böcker på enheten..."
+msgstr "Hämtar en lista över böcker på enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
-msgstr "Överföra böcker till enheten..."
+msgstr "Överför böcker till enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
-msgstr "Lägger till böcker till enhetens metadatslista..."
+msgstr "Lägger till böcker till enhetens metadatalista..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Tar bort böcker från enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
-msgstr "Ta bort böcker från enhetens metadatslista..."
+msgstr "Ta bort böcker från enhetens metadatalista..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Skickar metadata till enheten..."
 
@@ -840,7 +866,7 @@ msgstr "%prog [alternativ] mybook.chm"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
-msgstr "Resultatkatalog. Standard nuvarande katalog"
+msgstr "Katalog för utdata. Som standard nuvarande katalog"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:45
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
@@ -850,17 +876,17 @@ msgstr "Ange boktitel"
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:47
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
 msgid "Set sort key for the title"
-msgstr "Ange sorteringsnyckeln för titeln"
+msgstr "Ange sorteringsnyckel för titeln"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
 msgid "Set the author"
-msgstr "Ange författaren"
+msgstr "Ange författare"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:51
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 msgid "Set sort key for the author"
-msgstr "Ange sorteringsnyckeln för författaren"
+msgstr "Ange sorteringsnyckel för författaren"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597
@@ -871,7 +897,7 @@ msgstr "Den kategori boken tillhör. Exempel: Historia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600
 msgid "Path to a graphic that will be set as this files' thumbnail"
 msgstr ""
-"Sökväg till en bild som kommer att ställas då detta objekts miniatyrbild"
+"Sökväg till en bild som kommer att användas som detta objekts miniatyrbild"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
@@ -880,17 +906,17 @@ msgstr "Sökväg till en txt-fil som innehåller en kommentar."
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid "Extract thumbnail from LRF file"
-msgstr "Utdrag miniatyrbild från LRF fil"
+msgstr "Extrahera miniatyrbild från LRF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
 msgid "Set the publisher"
-msgstr "Ange förlaget"
+msgstr "Ange förlag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:64
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set the book classification"
-msgstr "Ange boken klassificering"
+msgstr "Ange bokens klassificering"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:65
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610
@@ -908,8 +934,8 @@ msgid ""
 "Extract cover from LRF file. Note that the LRF format has no defined cover, "
 "so we use some heuristics to guess the cover."
 msgstr ""
-"Extrahera omslag från LRF fil. Observera att LRF formatet inte har några "
-"definierade omslag, så vi använder några heuristik att gissa omslaget."
+"Extrahera omslag från en LRF-fil. Observera att LRF-formatet inte har några "
+"definierade omslag, så vi kommer att gissa omslaget."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:70
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615
@@ -918,11 +944,11 @@ msgstr "Ange bokens identitet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
-msgstr "Ange typpsnitt delta"
+msgstr "Ange teckensnittsdelta"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
-msgstr "Framställer %s"
+msgstr "Renderade %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
@@ -944,20 +970,20 @@ msgid ""
 "of less than 256 may result in blurred text on your device if you are "
 "creating your comics in EPUB format."
 msgstr ""
-"Antal färger för gråskalebildskonvertering. Grundinställning: %default. "
-"Värden mindre än 256 kan orsaka suddig text på din enhet om du skapar dina "
-"serier i Epub format."
+"Antal färger för gråskaleskonvertering. Grundinställning: %default. Värden "
+"mindre än 256 kan orsaka suddig text på din enhet om du skapar dina serier i "
+"Epub-format."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:283
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
-"Inaktivera normalisering (förbättre kontrast) färgskala för bilder. "
-"Grundinställning: Falsk"
+"Normalisera inte bilders färgskalor (d.v.s. förbättra inte deras kontrast). "
+"Grundinställning: Falskt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:286
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
-msgstr "Behålla bildens format. Grundinställning är att fylla skärmen."
+msgstr "Behåll bildens proportioner. Grundinställning är att fylla skärmen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
@@ -968,19 +994,19 @@ msgid ""
 "Disable trimming of comic pages. For some comics, trimming might remove "
 "content as well as borders."
 msgstr ""
-"Inaktivera beskärning av komiska sidor. För vissa serier, kan beskärning "
-"klippa bort innehåll och ramar."
+"Beskär inte seriesidor. I vissa serier, kan beskärning klippa bort innehåll "
+"och ramar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
 msgid "Don't split landscape images into two portrait images"
-msgstr "Dela inte landskap bilder i två porträttbilder"
+msgstr "Dela inte liggande bilder i två stående"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:295
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
-"Behåll bildformat och skala bilden med skärmens höjd som bildens bredd för "
+"Behåll proportioner och skala bilden med skärmens höjd som bildens bredd för "
 "visning i liggande format."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:298
@@ -988,24 +1014,24 @@ msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
-"Används för höger-till-vänster publikationer som t.ex manga. Får "
-"landskapssidor att delas upp i porträttssidorna från höger-till-vänster."
+"Används för höger-till-vänster publikationer som manga. Får liggande sidor "
+"att delas upp i stående från höger till vänster."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
-"Aktivera fläckborttagning. Minskar brusfläckar. Kan kraftigt  öka "
-"bearbetningstiden."
+"Aktivera fläckborttagning. Minskar brusfläckar. Kan öka bearbetningstiden "
+"kraftigt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:305
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
-"Sortera inte filerna i serietidningar i bokstavsordning efter namn. Istället "
-"använda den ordning de lades till serietidningar."
+"Sortera inte filerna i serietidningarna i bokstavsordning. Använd i stället "
+"den ordning i vilken de lades till serietidningarna."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:309
 msgid ""
@@ -1013,13 +1039,13 @@ msgid ""
 "experiment to see which format gives you optimal size and look on your "
 "device."
 msgstr ""
-"Det format som bilderna i den skapade e-bok konverteras till. Du kan "
-"experimentera för att se vilket format som ger dig optimal storlek och "
-"utseende på din enhet."
+"Det format som bilderna i den skapade e-boken konverteras till. Du kan "
+"experimentera för att se vilket format som ger bäst storlek och utseende på "
+"din enhet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
-msgstr "Uför inte på någon bearbetning av bilden"
+msgstr "Bearbeta inte bilden"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
 msgid "Do not convert the image to grayscale (black and white)"
@@ -1062,33 +1088,33 @@ msgstr ""
 "input_file är indata och output_file är utdata. Båda måste anges som de "
 "första två argumenten till kommandot.\n"
 "\n"
-"E-boksformatets utdata är gissade från filändelsen av output_file. "
-"output_file kan också vara av speciellt format. EXT där EXT är utdatafilens "
-"ändelse. I det här fallet är namnet på utdatafilen härledda av namnet på "
+"E-bokens utdataformat gissas utifrån filändelsen på output_file. output_file "
+"kan också vara av det speciellt formatet .EXT där EXT är utdatafilens "
+"ändelse. I det fallet härleds namnet på utdatafilen från namnet på "
 "indatafilen. Observera att filnamnen inte får börja med ett bindestreck. "
-"Slutligen, om output_file inte har ändelse, då behandlas den som en katalog "
-"och en \"öppen e-bok\" (OEB) bestående av HTML-filer som skrivs till den "
+"Slutligen: om output_file saknar ändelse, behandlas den som en katalog och "
+"en \"öppen e-bok\" (OEB) bestående av HTML-filer som skrivs till den "
 "katalogen. Dessa filer är filer som normalt skulle ha gått till "
-"utdatainsticksmodulen.\n"
+"utdatatillägget.\n"
 "\n"
-"Efter angivande av indata- och utdatafil kan du anpassa konverteringen genom "
-"att ange olika alternativ. De tillgängliga alternativen beror på indata- och "
-"utdatafiltyper. För att få hjälp om dem specificera indata- och utdatafil en "
-"och använd -h alternativet.\n"
+"Efter att ha angivit indata- och utdatafil kan du anpassa konverteringen "
+"genom att ange olika alternativ. De tillgängliga alternativen beror på "
+"filtypen för indata och utdata. För att få hjälp om dem, specificera indata- "
+"och utdatafil och använd alternativet -h.\n"
 "\n"
-"För fullständig dokumentation omvandlingssystemet se\n"
+"För fullständig dokumentation om konverteringssystemet se\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
-msgstr "INDATA ALTERNATIV"
+msgstr "ALTERNATIV FÖR INDATA"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
-msgstr "Alternativ för att kontrollera bearbetningen av ingående %s fil"
+msgstr "Alternativ för att kontrollera bearbetningen av ingående %s-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
-msgstr "UTDATA ALTERNATIV"
+msgstr "ALTERNATIV FÖR UTDATA"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
@@ -1096,11 +1122,11 @@ msgstr "Alternativ för att kontrollera bearbetningen av utdata %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:119
 msgid "Options to control the look and feel of the output"
-msgstr "Alternativ för att styra utseendet av utdata"
+msgstr "Alternativ för utdatas utseende"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
-msgstr "Kontroll automatisk detektering av dokumentets struktur."
+msgstr "Kontrollera automatisk detektering av dokumentets struktur."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:145
 msgid ""
@@ -1108,17 +1134,17 @@ msgid ""
 "source file has a Table of Contents, it will be used in preference to the "
 "automatically generated one."
 msgstr ""
-"Styr automatisk generering av en innehållsförteckning. Som standard, om "
-"källfilen har en innehållsförteckning, kommer den att användas i stället för "
-"att den automatiskt skapade en."
+"Styr hur innehållsförteckningen skapas. Om källfilen har en "
+"innehållsförteckning, kommer denna att användas i stället för den "
+"automatiskt skapade."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
-msgstr "Alternativ för att ställa metadata i utdata"
+msgstr "Alternativ för att skriva metadata till utdata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
-msgstr "Alternativ för att hjälpa till med felsöka omvandling"
+msgstr "Alternativ för att hjälpa till att felsöka konverteringen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
@@ -1126,11 +1152,11 @@ msgstr "Lista inbyggda recept"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
-msgstr "Utdata sparas till"
+msgstr "Utdata sparade till"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
-msgstr "Grad av ordrikedom. Ange flera gånger större ordrikedom."
+msgstr "Grad av ordrikedom. Ange flera gånger för större ordrikedom."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
@@ -1138,9 +1164,8 @@ msgid ""
 "specified directory. Useful if you are unsure at which stage of the "
 "conversion process a bug is occurring."
 msgstr ""
-"Spara utdata från olika stadier av omvandlingssekvensen till den angivna "
-"katalogen. Användbart om du är osäker på vilket stadium i "
-"omvandlingsprocessen en bugg uppträder."
+"Spara utdata från olika stadier av konverteringssekvensen till den angivna "
+"katalogen. Användbart om du är osäker på i vilket stadium en bugg uppträder."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111
 msgid ""
@@ -1149,10 +1174,9 @@ msgid ""
 "For example resolution dependent lengths (i.e. lengths in pixels). Choices "
 "are:"
 msgstr ""
-"Ange ingångsprofilen. Ingångsprofilen ger information till "
-"omvandlingssystemet om hur man ska tolka olika information i indata av "
-"dokumentet. Till exempel upplösning beroende längder (dvs. längder i "
-"pixlar). Alternativen är:"
+"Ange profilen för indata. Profilen ger information till "
+"konverteringssystemet om hur information i indata ska tolkas. Till exempel "
+"upplösningberoende längd (d.v.s. längd i pixlar). Alternativen är:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122
 msgid ""
@@ -1161,10 +1185,10 @@ msgid ""
 "cases, an output profile is required to produce documents that will work on "
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
-"Specificera utdataprofilen. Utdataprofilen anger hur omvandlingssystemet "
-"optimerar skapade dokument för angiven enhet. I vissa fall behövs en "
-"dataprofil för att producera dokument som kommer att fungera på en enhet. "
-"Exempel EPUB på SONY Reader. Alternativen är:"
+"Ange profilen för utdata. Profilen anger hur konverteringssystemet ska "
+"optimera det skapade dokument för den angivna enheten. I vissa fall behövs "
+"en profil för utdata för att dokumentet skall fungera på en viss enhet, "
+"t.ex. EPUB på SONY Reader. Alternativen är:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133
 msgid ""
@@ -1173,10 +1197,10 @@ msgid ""
 "fonts in the output bigger and vice versa. By default, the base font size is "
 "chosen based on the output profile you chose."
 msgstr ""
-"Basstorleken i pts. Alla teckenstorlekar i den producerade boken kommer att "
-"skalas om på grundval av denna storlek. Genom att välja en större storlek du "
-"kan göra teckensnitten i dokumentet större och vice versa. Som standard är "
-"den basstorleken väljas baserat på utdataprofil du valt."
+"Basstorleken i punkter. Alla teckenstorlekar i den producerade boken kommer "
+"att skalas om utifrån denna storlek. Genom att välja en större storlek kan "
+"du göra teckensnitten i dokumentet större och vice versa. Som standard väljs "
+"basstorleken utifrån den utdataprofil du valt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
@@ -1186,24 +1210,24 @@ msgid ""
 "algorithm uses these sizes to intelligently rescale fonts. The default is to "
 "use a mapping based on the output profile you chose."
 msgstr ""
-"Omvandling från CSS teckensnittsnamn till teckenstorlekar i pts. Exempel "
-"inställningen är 12,12,14,16,18,20,22,24. Dessa är de omvandlingar av "
-"storlekarna XX-små till xx-stora, med den slutliga storlek är för stort "
-"teckensnitt. Teckensnittsomskalningsalgoritmen  använder dessa storlekar att "
-"på intelligentsätt omskala teckensnitt. Standard är att använda en "
-"omvandling baserad på utdataprofilen du valt."
+"Omvandlar teckensnittsnamn från CSS till teckenstorlekar i punkter. En "
+"exempelinställning är 12,12,14,16,18,20,22,24. Detta omvandlar storlekarna "
+"xx-small till xx-large - det sista värdet används för enorma teckensnitt. "
+"Omskalningsalgoritmen använder dessa storlekar för att på ett smart sätt "
+"omskala teckensnitten. Som standard omvandlas teckensnitten utifrån vald "
+"utdataprofil."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
-msgstr "Inaktivera alla omskalningar av teckenstorlekar."
+msgstr "Omskala inga teckenstorlekar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
 msgid ""
 "The line height in pts. Controls spacing between consecutive lines of text. "
 "By default no line height manipulation is performed."
 msgstr ""
-"Radavståndet i pts. Kontrollerar avståndet mellan två rader med text. Som "
-"standard utförs inga radavståndsmanipulationer."
+"Radavståndet i punkter. Kontrollerar avståndet mellan två påföljande "
+"textrader. Som standard ändras inte radavståndet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170
 msgid ""
@@ -1212,10 +1236,10 @@ msgid ""
 "page and other artifacts. This option will extract the content from the "
 "tables and present it in a linear fashion."
 msgstr ""
-"Några dåligt utformade dokument använder tabeller för att styra utformningen "
-"av texten på sidan. När dessa handlingar omvandlades finns ofta text som går "
+"Vissa dokument med dålig formgivning använder tabeller för att styra "
+"textflödet på sidan. När dessa dokument konverteras finns ofta text som går "
 "utanför sidan och andra artefakter. Detta alternativ kommer att extrahera "
-"innehållet från tabeller och presentera den på ett linjärt sätt."
+"innehållet från tabellerna och presentera det linjärt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180
 msgid ""
@@ -1224,8 +1248,8 @@ msgid ""
 "other forms of auto-detection."
 msgstr ""
 "XPath-uttryck som anger alla taggar som bör läggas till "
-"innehållsförteckningen på nivå ett. Om detta anges, får det företräde över "
-"andra former av automatisk upptäckt."
+"innehållsförteckningen på nivå ett. Om detta anges, får det företräde "
+"framför andra former av autodetektion."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189
 msgid ""
@@ -1235,7 +1259,7 @@ msgid ""
 msgstr ""
 "XPath-uttryck som anger alla taggar som bör läggas till "
 "innehållsförteckningen på nivå två. Varje post läggs till under den tidigare "
-"nivån."
+"posten på nivå ett."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197
 msgid ""
@@ -1244,8 +1268,8 @@ msgid ""
 "entry."
 msgstr ""
 "XPath-uttryck som anger alla taggar som bör läggas till "
-"innehållsförteckningen på nivå tre. Varje post skall läggas till under "
-"tidigare nivå två."
+"innehållsförteckningen på nivå tre. Varje post skall läggas till under den "
+"tidigare posten på nivå två."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205
 msgid ""
@@ -1253,7 +1277,7 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
-"Normalt, om källfilen redan har en innehållsförteckning, används det i "
+"Om källfilen redan har en innehållsförteckning, används normalt denna i "
 "stället för den automatiskt skapade. Med det här alternativet används alltid "
 "den automatiskt skapade."
 
@@ -1275,18 +1299,18 @@ msgid ""
 "is: %default. Links are only added to the TOC if less than the threshold "
 "number of chapters were detected."
 msgstr ""
-"Maximalt antal länkar för att infoga i innehållsförteckningen. Satt till 0 "
-"för att avaktivera. Grundinställning är: %default. Länkarna läggs endast  "
-"till innehållsförteckningen om mindre än tröskelvärdet antal kapitel "
-"upptäckts."
+"Maximalt antal länkar för att infoga i innehållsförteckningen. Sätt till 0 "
+"för att inaktivera. Grundinställning är: %default. Länkarna läggs endast "
+"till innehållsförteckningen om antalet upptäckta kapitel är lägre än "
+"tröskelvärdet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235
 msgid ""
 "Remove entries from the Table of Contents whose titles match the specified "
 "regular expression. Matching entries and all their children are removed."
 msgstr ""
-"Ta bort poster från innehållsförteckningen vilkas titlar passar med det "
-"angivna reguljära uttrycket. Matchande poster och alla deras barn tas bort."
+"Ta bort poster från innehållsförteckningen vilkas titlar matchar det angivna "
+"reguljära uttrycket. Matchande poster och alla deras barn tas bort."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246
 msgid ""
@@ -1298,11 +1322,11 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 "Ett XPath-uttryck för att upptäcka kapiteltitlar. Grundinställningen är att "
-"betrakta <h1> eller <h2> taggar som innehåller orden \"kapitel\", \"bok\", "
-"\"avsnitt\" eller \"del\" i kapiteltitlar samt alla taggar som har class = "
-"\"kapitel\". Uttrycket används för att utvärdera en lista av element. För "
-"att inaktivera kapitelupptäckt, använd uttrycket \"/\". Se XPath "
-"beskrivningen i calibre's användarhandbok för ytterligare hjälp om hur du "
+"betrakta <h1>- eller <h2>-taggar som innehåller orden \"kapitel\", \"bok\", "
+"\"avsnitt\" eller \"del\" som kapiteltitlar samt alla taggar som har "
+"class=\"kapitel\". Uttrycket används för att utvärdera en lista av element. "
+"För att inaktivera kapiteldetektion, använd uttrycket \"/\". Se XPaths "
+"beskrivning i Calibres användarhandbok för ytterligare hjälp om hur du "
 "använder den här funktionen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260
@@ -1312,11 +1336,11 @@ msgid ""
 "chapters. A value of \"none\" will disable chapter marking and a value of "
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
-"Anger hur du markerar upptäckta kapitel. Värdet \"sidbrytning\" kommer att "
-"infoga sidbrytningar innan kapitel. Värdet \"regeln\" kommer att infoga en "
-"rad tidigare kapitlen. Med värdet \"inga\" kommer att stänga kapitel "
-"märkning och ett värde på \"båda\" kommer att använda både sidbrytningar och "
-"linjer för att markera kapitel."
+"Anger hur upptäckta kapitel markeras. Värdet \"pagebreak\" infogar en "
+"sidbrytning före varje nytt kapitel. Värdet \"rule\" infogar en blankrad "
+"före nytt kapitel. Värdet \"none\" inaktiverar kapitelmärkning, och om "
+"värdet \"both\" anges, kommer både sidbrytningar och blankrader att markera "
+"nya kapitel."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
 msgid ""
@@ -1324,41 +1348,41 @@ msgid ""
 "the style rules from the source file, so it can be used to override those "
 "rules."
 msgstr ""
-"Antingen sökvägen till en CSS-stilmall eller rå CSS. Detta CSS kommer att "
-"läggas till stilreglerna från källfilen, så de kan användas för att "
-"åsidosätta dessa bestämmelser."
+"Antingen sökvägen till en CSS-stilmall eller rå CSS. Denna CSS-kod kommer "
+"att läggas till stilreglerna i källfilen. De kan också användas för att "
+"åsidosätta källfilens bestämmelser."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
-msgstr "Ett XPath-uttryck. Sidbrytningar införs före specificerade delar."
+msgstr "Ett XPath-uttryck. Sidbrytningar infogas före specificerade element."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285
 msgid ""
 "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Ställ in den övre marginalen i poäng. Grundinställning är %default. Anm: 72 "
-"pts motsvarar 1 tum"
+"Ange övre marginal i punkter. Grundinställning är %default. 72 punkter "
+"motsvarar 1 tum"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290
 msgid ""
 "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Ställ nedre marginalen i poäng. Grundinställning är %default. Anm: 72 pts "
-"motsvarar 1 tum"
+"Nedre marginal i punkter. Grundinställning är %default. 72 punkter motsvarar "
+"1 tum"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295
 msgid ""
 "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Ställ in vänstermarginalen i pts. Grundinställningen är %default. Anm: 72 "
-"pts motsvarar 1 tum"
+"Vänstermarginal i punkter. Grundinställningen är %default. 72 punkter "
+"motsvarar 1 tum"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300
 msgid ""
 "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Ställ högermarginalen i pts. Grundinställningen är %default. Anm: 72 pts "
+"Högermarginal i punkter. Grundinställningen är %default. 72 punkter "
 "motsvarar 1 tum"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306
@@ -1369,11 +1393,11 @@ msgid ""
 "\"original\" (the default) does not change justification in the source file. "
 "Note that only some output formats support justification."
 msgstr ""
-"Ändra textjusteringen. Ett värde av \"vänster\" konverterar alla justerad "
-"text i källan till vänster linje (dvs ojusterad) text. Med värdet "
-"\"justera\" konverterar all ojusterad text till justerad. Ett värde av "
-"\"original\" (standard) inte ändras justeringen i källfilen. Observera att "
-"endast vissa utformat stöder justering."
+"Ändra textjusteringen. Värdet \"vänster\" konverterar all marginaljusterad "
+"text i källan till vänsterjusterad text (d.v.s. ojusterad). Med värdet "
+"\"justera\" konverteras all ojusterad text till mariginaljusterad. Värdet "
+"\"original\" (standard) behåller de inställningar för justering som anges i "
+"källfilen. Observera att endast vissa format stöder mariginaljustering."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
@@ -1381,9 +1405,9 @@ msgid ""
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
-"Tar bort mellanslag mellan stycken. Fastställer också ett indrag på stycket "
-"på 1.5em. Mellanslagsbortagning fungerar inte om källfilen inte använder "
-"stycken (<p> eller <div> taggar)."
+"Tar bort mellanrum mellan stycken. Indenterar även första raden på det nya "
+"stycket 1,5 em. Mellanrum kan inte tas bort om källfilen inte använder "
+"stycken (<p>- eller <div>-taggar)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
 msgid ""
@@ -1391,9 +1415,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
-"När calibre tar bort mellanstyckesavstånd ställer det automatiskt ett "
-"styckesindrag, för att säkerställa att stycken lätt kan urskiljas. Det här "
-"alternativet styr bredden på nämnda indentering."
+"När Calibre tar bort mellanrum mellan stycken intenteras automatiskt nästa "
+"stycke, så att det lätt kan skiljas från det föregående. Det här "
+"alternativet styr bredden på denna indentering."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
@@ -1406,31 +1430,31 @@ msgid ""
 "Insert a blank line between paragraphs. Will not work if the source file "
 "does not use paragraphs (<p> or <div> tags)."
 msgstr ""
-"Infoga en tom rad mellan stycken. Fungerar inte om källfilen inte använder "
-"punkt (<p> eller <div> taggar)."
+"Infoga en blankrad mellan stycken. Fungerar inte om källfilen inte använder "
+"stycken (<p>-eller <div>- taggar)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343
 msgid ""
 "Remove the first image from the input ebook. Useful if the first image in "
 "the source file is a cover and you are specifying an external cover."
 msgstr ""
-"Ta bort den första bilden från e-boksindata. Användbart om den första bilden "
-"i källfilen är ett omslag och du anger en externt omslag."
+"Ta bort den första bilden från e-boken i indata. Används om den första "
+"bilden i källfilen är ett omslag och du anger ett externt omslag."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351
 msgid ""
 "Insert the book metadata at the start of the book. This is useful if your "
 "ebook reader does not support displaying/searching metadata directly."
 msgstr ""
-"Infoga bokens metadata i början av boken. Detta är användbart om du e-"
-"boksläsare inte stöder visning / sökning metadata direkt."
+"Infoga bokens metadata i början av boken. Används om din läsplatta inte kan "
+"visa eller söka efter metadata direkt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359
 msgid ""
 "Attempt to detect and correct hard line breaks and other problems in the "
 "source file. This may make things worse, so use with care."
 msgstr ""
-"Försök att upptäcka och rätta hårda radbrytningar och andra problem i "
+"Försök att upptäcka och rätta till hårda radbrytningar och andra problem i "
 "källfilen. Detta kan göra saken värre, så använd detta med försiktighet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
@@ -1439,7 +1463,7 @@ msgstr "Använd ett reguljärt uttryck för att försöka ta bort sidhuvudet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
 msgid "The regular expression to use to remove the header."
-msgstr "Det reguljära uttrycket att användas för att ta bort rubriken."
+msgstr "Det reguljära uttrycket för att ta bort sidhuvudet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
 msgid "Use a regular expression to try and remove the footer."
@@ -1447,14 +1471,14 @@ msgstr "Använd ett reguljärt uttryck för att försöka ta bort sidfoten."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
 msgid "The regular expression to use to remove the footer."
-msgstr "Det reguljära uttrycket att användas för att ta bort sidfoten."
+msgstr "Det reguljära uttrycket för att ta bort sidfoten."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
 msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
-"Läs metadata från den angivna OPF filen. Metadata läst från filen kommer att "
+"Läs metadata från den angivna OPF-filen. Metadata från denna fil kommer att "
 "åsidosätta alla metadata i källfilen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
@@ -1466,13 +1490,12 @@ msgid ""
 "by Chinese and Japanese for instance) the representation used by the largest "
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
-"Transkribera Unicode-tecken till en ASCII-representation. Används med "
-"försiktighet, eftersom detta kommer att ersätta Unicode-tecken med ASCII. "
-"Till exempel kommer det att ersätta \"%s\" med \"Mikhail Gorbachiov\". Tänk "
-"också på att i de fall där det finns flera representationer av ett tecken "
-"(tecken som delas av kinesiska och japanska exempelvis) representation som "
-"används av flest människor kommer att användas (kinesiska i föregående "
-"exempel)."
+"Transkribera Unicode-tecken till ASCII. Används med försiktighet, eftersom "
+"Unicode-tecken kommer att ersättas med ASCII. Till exempel kommer det att "
+"ersätta \"%s\" med \"Mikhail Gorbachiov\". OBS: Om det finns flera "
+"uttalsvarianter av ett tecken (t.ex. tecken för som används i både kinesiska "
+"och japanska), kommer det uttal som används av flest människor att användas "
+"vid transkribering (kinesiska i det föregående exemplet)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:416
 msgid ""
@@ -1483,12 +1506,12 @@ msgid ""
 "corresponding pair of normal characters. This option will preserve them "
 "instead."
 msgstr ""
-"Bevara ligaturer som finns i indokumentet. En ligatur är en speciell "
-"rendering av ett par karaktärer som ff, fi, fl et cetera. De flesta läsare "
-"har inte stöd för ligaturer i deras standard teckensnitt, så det är "
-"osannolikt att de återges korrekt. Som standard kommer calibre omvandla en "
-"ligatur till motsvarande par av vanliga tecken. Detta alternativ kommer att "
-"bevara dem i stället."
+"Bevara ligaturer som finns i indatadokumentet. En ligatur är en speciell "
+"rendering ett teckenpar som ff, fi, fl et cetera. De flesta läsplattor "
+"saknar stöd för ligaturer i deras standardteckensnitt, så det är osannolikt "
+"att de återges korrekt. Som standard omvandlar Calibre en ligatur till "
+"motsvarande par av vanliga tecken. Detta alternativ kommer att bevara "
+"ligaturerna i stället."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
@@ -1529,12 +1552,12 @@ msgstr "Ange serien denna e-bok tillhör."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
-msgstr "Ange index för boken i denna serie."
+msgstr "Ange bokens nummer i serien."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
 msgid "Set the rating. Should be a number between 1 and 5."
-msgstr "Ange betyg. Ska vara ett nummer mellan 1 och 5."
+msgstr "Ange betyg. Skall vara ett nummer mellan 1 och 5."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:469
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66
@@ -1544,7 +1567,7 @@ msgstr "Ange ISBN för boken."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:473
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
 msgid "Set the tags for the book. Should be a comma separated list."
-msgstr "Ange taggar för boken. Bör vara en kommaseparerad lista."
+msgstr "Ange etiketter för boken. Skall vara en kommaseparerad lista."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
@@ -1566,25 +1589,25 @@ msgstr "Ange bokens tidsstämpel (används av datumkolumnen i kaliber)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
-msgstr "Kunde inte hitta en e-bok inuti arkivet"
+msgstr "Kunde inte hitta någon e-bok i arkivet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
-msgstr "Värden av serie index och omdömen måste vara siffror. Förbiser"
+msgstr "Nummer i serien och betyg måste anges som siffror. Ignorerar"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
-msgstr "Misslyckades med att tolka datum/ tid"
+msgstr "Misslyckades med att tolka datum/tid"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
-msgstr "Konvertera indata till HTML..."
+msgstr "Konverterar indata till HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
-msgstr "Utför omformning av e-bok..."
+msgstr "Omformar e-boken..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Skapar"
 
@@ -1593,7 +1616,7 @@ msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
 "The contents of the directory are first deleted, so be careful."
 msgstr ""
-"Extrahera innehållet i den genererade EPUB filen till den angivna katalogen. "
+"Extrahera innehållet i den genererade EPUB-filen till den angivna katalogen. "
 "Innehållet i katalogen tas först bort, så var försiktig."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
@@ -1605,10 +1628,10 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 "Inaktivera delning vid sidbrytningar. Normalt delas indatafilen automatiskt "
-"upp sibrytning i två filer. Detta ger eboksutdata som kan tolkas snabbare "
-"och med mindre resurser. Men delningen är långsam och om din källfilen "
-"innehåller ett mycket stort antal sidbrytningar, bör du stänga av uppdelning "
-"på sidbrytningar."
+"i två filer vid varje sidbrytning. Detta ger en e-bok som kan tolkas "
+"snabbare och med mindre resurser, men delningen är långsam, och om källfilen "
+"innehåller ett mycket stort antal sidbrytningar, bör du inaktivera delning "
+"vid sidbrytningar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
@@ -1616,10 +1639,10 @@ msgid ""
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
-"Dela alla HTML-filer som är större än denna storlek (i KB). Detta är "
-"nödvändigt eftersom de flesta EPUB-läsare inte kan hantera stora "
-"filstorlekar. Standardvärdet %defaultKB är den storlek som krävs för Adobe "
-"Digital Editions."
+"Dela alla HTML-filer som är större än denna storlek (i KiB). Detta är "
+"nödvändigt eftersom de flesta EPUB-läsare inte kan hantera stora filer. "
+"Standardvärdet %default KiB är den storlek som krävs för Adobe Digital "
+"Editions."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
@@ -1627,9 +1650,9 @@ msgid ""
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
-"Normalt, om indatafilen inte har något omslag och du inte anger ett, är att "
-"ett standardomslag skapats med titel, författare, m.m. Det här alternativet "
-"inaktiverar skapandet av detta skydd."
+"Om indatafilen inte har något omslag och du inte anger ett, skapas normalt "
+"ett standardomslag skapats med titel, författare, m.m. Med detta alternativ "
+"aktiverat skapas inga standardomslag."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
@@ -1651,16 +1674,16 @@ msgid ""
 "and bottom of the image, but the image will never be distorted. Without this "
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
-"När du använder ett SVG omslag kommer detta alternativ att leda till att "
-"omslag skalas för att täcka den tillgängliga bildytan, men ändå bevara dess "
-"proportioner (förhållandet mellan bredd och höjd). Det innebär att det kan "
-"finnas vita kanter på sidorna eller toppen och botten av bilden, men bilden "
-"kommer aldrig att bli förvrängd. Utan denna möjlighet bilden kan vara en "
-"aning förvrängd, men det kommer inte finnas ramar."
+"När du använder ett SVG-omslag kommer detta alternativ att leda till att "
+"omslaget skalas om, med bibehållna proportioner, för att täcka den "
+"tillgängliga bildytan. Det innebär att det kan finnas vita kanter på sidorna "
+"eller toppen och på botten av bilden, men bilden kommer aldrig att bli "
+"förvrängd. Om detta alternativ inaktiveras, kan bilden bli en aning "
+"förvrängd, men det kommer inte finnas några ramar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
-msgstr "Börja"
+msgstr "Starta"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
@@ -1670,7 +1693,7 @@ msgstr "Innehållsförteckning"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:32
 msgid "Do not insert a Table of Contents at the beginning of the book."
-msgstr "Sätt inte in en innehållsförteckning i början av boken."
+msgstr "Infoga ingen innehållsförteckning i början av boken."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32
@@ -1678,15 +1701,15 @@ msgstr "Sätt inte in en innehållsförteckning i början av boken."
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/output.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:35
 msgid "Add Table of Contents to beginning of the book."
-msgstr "Lägg till innehållsförteckningen i början av boken."
+msgstr "Infoga innehållsförteckning i början av boken."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:243
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first."
 msgstr ""
-"Traversera igenom länkar i HTML-filer på bredden först. Normalt är de "
-"traverseras på djup först."
+"Gå igenom länkarna i HTML-filer på bredden först. Normalt gås de först "
+"igenom på djupet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:250
 msgid ""
@@ -1694,9 +1717,9 @@ msgid ""
 "negative. 0 implies that no links in the root HTML file are followed. "
 "Default is %default."
 msgstr ""
-"Högsta tillåtna antal rekursioner när länkar följs i HTML-filer. Måste vara "
-"icke-negativa. 0 innebär att ingen länkar i roten HTML-filen följs. Standard "
-"är %default."
+"Högsta tillåtna djup när länkar följs i HTML-filer. Måste vara ett positivt "
+"värde. 0 innebär att ingen länkar i rot-HTML-filen följs. Standard är "
+"%default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:259
 msgid ""
@@ -1705,27 +1728,27 @@ msgid ""
 "can result in various nasty side effects in the rest of of the conversion "
 "pipeline."
 msgstr ""
-"Normalt omorganiserar instickmodulen alla indatafilerna till en vanlig "
-"mappstruktur. Använda bara det här alternativet om du vet vad du gör "
+"Normalt omstrukturerar indatatillägget alla indatafilerna till en vanlig "
+"mappstruktur. Använd bara det här alternativet om du vet vad du gör, "
 "eftersom det kan resultera i diverse otäcka biverkningar i resten av "
-"omvandlingsekvensen."
+"konverteringssekvensen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:267
 msgid ""
 "Average line length for line breaking if the HTML is from a previous partial "
 "conversion of a PDF file. Default is %default which disables this."
 msgstr ""
-"Genomsnittlig radlängd för radbrytningsreglerna om HTML är från en tidigare "
-"partiell omvandling av en PDF-fil. Standard är %default  som inaktiverar det "
-"här."
+"Genomsnittlig radlängd att bryta raden vid om HTML kommer från en tidigare "
+"partiell omvandling av en PDF-fil. Standard är %default som inaktiverar "
+"detta."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
-msgstr "Skapa LIT fil från EPUB..."
+msgstr "Skapar LIT-fil från EPUB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
-msgstr "\tBook Designer fil upptäckt."
+msgstr "\tBook Designer-fil upptäckt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
@@ -1733,7 +1756,7 @@ msgstr "\tTolkar HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
-msgstr "\tBaen fil upptäckt. Omttolkar..."
+msgstr "\tBaen-fil upptäckt. Omttolkar..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
@@ -1745,7 +1768,7 @@ msgstr "Bearbetar %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
-msgstr "\tOmvandling till BBeB..."
+msgstr "\tKonverterar till BBeB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552
@@ -1758,11 +1781,11 @@ msgstr "%s är en tom fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
-msgstr "Misslyckades med att tolka länken %s %s"
+msgstr "Kunde inte tolka länken %s %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
-msgstr "Kan inte lägga till länken %s till innehållsförteckning"
+msgstr "Kan inte lägga till länken %s till innehållsförteckningen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
@@ -1770,7 +1793,7 @@ msgstr "Kan inte bearbeta bild %s. Fel: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
-msgstr "Kan inte bearbeta interlaced PNG %s"
+msgstr "Kan inte bearbeta sammanvävd (interlaced) PNG %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
@@ -1783,19 +1806,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
-msgstr "Ett fel uppstod när en tabell: %s. Förbiser tabellmärkord."
+msgstr ""
+"Ett fel uppstod när en tabell bearbetades: %s. Ignorerar tabellformatering."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
-"Dålig tabell:\n"
+"Ogiltig tabell:\n"
 "%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
 msgid "Table has cell that is too large"
-msgstr "Tabell har cell som är för stor"
+msgstr "Tabellen har en cell som är för stor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
@@ -1807,7 +1831,7 @@ msgstr "Kan inte läsa från: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
-msgstr "Kunde inte bearbeta opf file"
+msgstr "Kunde inte bearbeta en OPF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
 msgid ""
@@ -1815,15 +1839,15 @@ msgid ""
 "Convert an LRF file into an LRS (XML UTF-8 encoded) file"
 msgstr ""
 "%prog book.lrf\n"
-"Konvertera en LRF-fil till en LRS (XML UTF-8-kodad) fil"
+"Konvertera en LRF-fil till en LRS-fil (XML, UTF-8-kodad)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
-msgstr "LRS filutdata"
+msgstr "LRS-fil för utdata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
-msgstr "Spara inte inbäddade bilds- och typsnittfiler till hårddisken"
+msgstr "Spara inte inbäddade bild- och typsnittfiler till hårddisken"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
@@ -1835,7 +1859,7 @@ msgstr "Skapar XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
-msgstr "LRS skrivs till "
+msgstr "Skrev LRS till "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
@@ -1847,24 +1871,24 @@ msgid ""
 "Compile an LRS file into an LRF file."
 msgstr ""
 "%prog [alternativ] file.lrs\n"
-"Sammanställ LRS-fil till en LRF-fil."
+"Skapa LRF-fil från LRS-fil."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
-msgstr "Sökväg till utfil"
+msgstr "Sökväg till utdatafil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:113
 msgid "Verbose processing"
-msgstr "Pratsam bearbetning"
+msgstr "Följ bearbetningsprocessen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
-msgstr "Konvertera LRS till LRS, användbart för felsökning."
+msgstr "Konvertera LRS till LRS. Används vid felsökning."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
-msgstr "Ogiltig LRF fil. Kunde inte ställa in metadata."
+msgstr "Ogiltig LRF-fil. Kunde inte skriva metadata."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
@@ -1877,27 +1901,27 @@ msgstr ""
 "%prog [alternativ] mybook.lrf\n"
 "\n"
 "\n"
-"Visa / redigera metadata i ett LRF-fil.\n"
+"Visa/redigera metadata i en LRF-fil.\n"
 "\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:603
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
 msgstr ""
-"Sökväg till en txt-fil som innehåller kommentaren som skall lagras i LRF-"
+"Sökväg till en TXT-fil som innehåller den kommentar som skall lagras i LRF-"
 "filen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90
 msgid "Enable autorotation of images that are wider than the screen width."
-msgstr "Aktivera autorotation av bilder som är bredare än skärmens bredd."
+msgstr "Rotera automatiskt bilder som är bredare än skärmens bredd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
-msgstr "Ange utrymmet mellan orden i pts. Grundinställning är %default"
+msgstr "Ange utrymmet mellan orden i punkter. Grundinställning är %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97
 msgid "Add a header to all the pages with title and author."
-msgstr "Lägg till ett sidhuvud på alla sidor med titel och författare."
+msgstr "Lägg till ett sidhuvud med titel och författare på alla sidor."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100
 msgid ""
@@ -1905,145 +1929,150 @@ msgid ""
 "title. Default is %default"
 msgstr ""
 "Ange format för sidhuvudet. %a ersätts med författaren och %t med titeln. "
-"Grundinställning är %default"
+"Grundinställningen är %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr ""
-"Lägg till extra mellanrum under sidhuvudet. Grundinställning är %default pt"
+"Lägg till extra mellanrum under sidhuvudet. Grundinställningen är %default "
+"punkter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:107
 msgid ""
 "Minimum paragraph indent (the indent of the first line of a paragraph) in "
 "pts. Default: %default"
 msgstr ""
-"Minsta styckeindraget (indraget för första raden i ett stycke) i pts. "
-"Grundinställning är %default"
+"Minsta styckeindraget (indraget för första raden i ett stycke) i punkter. "
+"Grundinställningen är %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:112
 msgid ""
 "Render tables in the HTML as images (useful if the document has large or "
 "complex tables)"
 msgstr ""
-"Framställ tabeller i HTML som bilder (användbart om handlingen har stora "
-"eller komplexa tabeller)"
+"Rendera tabeller i HTML som bilder (används om dokumentet har stora eller "
+"komplexa tabeller)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117
 msgid ""
 "Multiply the size of text in rendered tables by this factor. Default is "
 "%default"
 msgstr ""
-"Multiplicera storleken på texten i utförda tabeller med denna faktor. "
-"Grundinställning är %default"
+"Multiplicera storleken på texten i renderade tabeller med denna faktor. "
+"Grundinställningen är %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
-msgstr "Serif familjen av teckensnitt för att bädda in"
+msgstr "Bädda in denna teckensnittsfamilj som serif-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
-msgstr "Sans-serif familjen av teckensnitt för att bädda in"
+msgstr "Bädda in denna teckensnittsfamilj som sans serif-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
-msgstr "Monospace familjen av teckensnitt för att bädda in"
+msgstr "Bädda in denna teckensnittsfamilj som fast bredd-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "Serietidning"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:335
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:828
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Författare"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Förlag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1001
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
-msgstr "Serier"
+msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Språk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Tidsstämpel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Utgiven"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Rättigheter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
-msgstr "Redigeringsgranskning"
+msgstr "Redaktörsgranskning"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
 msgstr ""
-"Ta fram gemensamma e-bokformat från arkiv (zip / rar-filer). Försöka också "
-"att automatiskt upptäcka om de faktiskt är cbz / CBR-filer."
+"Extrahera vanliga e-boksformat från arkiv (ZIP-/RAR-filer). Försök också att "
+"automatiskt upptäcka om de egentligen är CBZ-/CBR-filer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
@@ -2063,14 +2092,14 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 "\n"
-"Läs/ Skriv metadata från / till e-bokfiler.\n"
+"Läs/Skriv metadata från/till e-bokfiler.\n"
 "\n"
 "Format som stöds för läsa metadata: %s\n"
 "\n"
 "Format som stöds för att skriva metadata: %s\n"
 "\n"
 "Olika filtyper stöder olika typer av metadata. Om du försöker ställa\n"
-"vissa metadata om en filtyp som inte stöds, kommer metadata att\n"
+"in vissa metadata om en filtyp som inte stöds dessa, kommer de att\n"
 "tyst ignoreras.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40
@@ -2086,7 +2115,7 @@ msgid ""
 "The version of the title to be used for sorting. If unspecified, and the "
 "title is specified, it will be auto-generated from the title."
 msgstr ""
-"Titelversinen som ska användas för sortering. Om ospecificerade, och titeln "
+"Titelversionen som ska användas för sortering. Om denna ej anges, och titeln "
 "är angiven, kommer den automatiskt genereras från titeln."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:48
@@ -2094,8 +2123,9 @@ msgid ""
 "String to be used when sorting by author. If unspecified, and the author(s) "
 "are specified, it will be auto-generated from the author(s)."
 msgstr ""
-"Sträng som ska användas vid sortering av författare. Om ospecificerade, och "
-"författare anges, kommer det automatiskt genereras från författaren."
+"Sträng som ska användas vid sortering av författare. Om denna ej anges, och "
+"författare anges, kommer strängen automatiskt genereras från författarens "
+"namn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
@@ -2107,11 +2137,11 @@ msgstr "Ange bokkategori."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
-msgstr "Ange publiceringsdatumet."
+msgstr "Ange publiceringsdatum."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77
 msgid "Get the cover from the ebook and save it at as the specified file."
-msgstr "Hämta omslag från e-bok och spara det på den specificerade filen."
+msgstr "Hämta omslag från e-bok och spara det som specificerad filen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80
 msgid ""
@@ -2126,9 +2156,9 @@ msgid ""
 "ebook. Metadata specified on the command line will override metadata read "
 "from the OPF file"
 msgstr ""
-"Läs metadata från de angivna OPF-filen och använd det som metadata i e-bok. "
-"Metadata som anges på kommandoraden kommer att åsidosätta metadata läst från "
-"OPF-fil"
+"Läs metadata från den angivna OPF-filen och använd dem som metadata i e-"
+"boken. Metadata som anges på kommandoraden kommer att åsidosätta metadata "
+"som lästs från OPF-filen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
@@ -2140,11 +2170,11 @@ msgstr "Ingen fil angiven"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
-msgstr "Original metadata"
+msgstr "Ursprunliga metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
-msgstr "Ändrad metadata"
+msgstr "Ändrade metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
@@ -2152,15 +2182,19 @@ msgstr "OPF skapad i"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
-msgstr "Omslag sparad till"
+msgstr "Omslag sparat till"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "Inget omslag hittades"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
-msgstr "Metadata nedladdning"
+msgstr "Hämta metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
@@ -2172,31 +2206,35 @@ msgstr "etiketter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
-msgstr "beskrivning / recensioner"
+msgstr "beskrivning/recensioner"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
-msgstr "Ladda ner %s från %s"
+msgstr "Hämta %s från %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:136
 msgid "Downloads metadata from Google Books"
-msgstr "Laddar ner metadata från Google Books"
+msgstr "Hämtar metadata från Google Books"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:152
 msgid "Downloads metadata from isbndb.com"
-msgstr "Laddar ner metadata from isbndb.com"
+msgstr "Hämtar metadata from isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:180
 msgid ""
 "To use isbndb.com you must sign up for a %sfree account%s and enter your "
 "access key below."
 msgstr ""
-"För att använda isbndb.com måste du registrera dig för ett %sfree konto %s "
-"och skriva in din behörighetskod nyckel nedan."
+"För att använda isbndb.com måste du registrera dig för ett %sgratis konto%s "
+"och ange behörighetsnyckel nedan."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:188
 msgid "Downloads social metadata from amazon.com"
-msgstr "Laddar ner tillhörande metadata från amazon.com"
+msgstr "Hämta sociala metadata från amazon.com"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
@@ -2215,29 +2253,29 @@ msgstr ""
 "%prog [alternativ] tangenten\n"
 "\n"
 "Hämta metadata för böcker från isndb.com. Du kan ange antingen\n"
-"böckers ISBN ID eller dess titel och författare. Om du anger titel och "
-"författare,\n"
-"så kan mer än en bok återlämnas.\n"
+"böckernas ISBN-nummer eller deras titel och författare. Om du anger titel "
+"och författare,\n"
+"kan mer än en bok komma i fråga.\n"
 "\n"
-"Nyckeln är det konto-nyckel som du skapar efter registrera dig för ett "
-"gratis konto från isbnd\n"
+"Nyckeln är den konto-nyckel som du skapar efter att du registrerat dig för "
+"ett gratis konto på isbnd\n"
 "\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:105
 msgid "The ISBN ID of the book you want metadata for."
-msgstr "ISBN ID för den bok du vill metadata för."
+msgstr "ISBN-numbret för den boken du vill hämta metadata till."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
-msgstr "Författaren vars bok att söka efter."
+msgstr "Författaren till den bok som eftersöks."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
-msgstr "Titeln på boken för att söka efter."
+msgstr "Titeln på boken som eftersöks."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
-msgstr "Utgivaren av boken för att söka efter."
+msgstr "Utgivaren av boken som eftersöks."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
@@ -2248,7 +2286,7 @@ msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
-"Kunde inte hämta omslag eftersom servern är hårt belastad. Försök igen "
+"Kunde inte hämta omslaget eftersom servern är hårt belastad. Försök igen "
 "senare."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
@@ -2257,7 +2295,7 @@ msgstr " hittas inte."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
-msgstr "LibraryThing.com serverfel. Försök igen senare."
+msgstr "Serverfel för LibraryThing.com. Försök igen senare."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
@@ -2271,7 +2309,7 @@ msgstr ""
 "\n"
 "Hämta ett omslag för boken som identifieras med ISBN från LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Omslag"
@@ -2279,32 +2317,32 @@ msgstr "Omslag"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
-"Modifiera bilder för att anpassa till Palm enhetens storleksbegränsningar ."
+"Modifiera bilder för att anpassa till Palm-enhetens storleksbegränsningar ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
-msgstr "När tillgängligt, använder författaresorteringsfält som författare."
+msgstr "Använd om möjligt författarsorteringsfältet som författare."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30
 msgid ""
 "Don't add Table of Contents to end of book. Useful if the book has its own "
 "table of contents."
 msgstr ""
-"Lägg inte innehållsförteckningen i slutet av boken. Användbart om boken har "
-"en egen innehållsförteckning."
+"Lägg inte till någon innehållsförteckning i slutet av boken. Används om "
+"boken har en egen innehållsförteckning."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
 msgid "Title for any generated in-line table of contents."
-msgstr "Titel för all infogad innehållsförteckning."
+msgstr "Titel för alla infogade innehållsförteckningar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
-msgstr "Inaktivera komprimering av filens innehåll."
+msgstr "Komprimera inte filer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40
 msgid "Tag marking book to be filed with Personal Docs"
-msgstr "Markera bok som ska lagras till personliga dokument"
+msgstr "Etikett för böcker som ska lagras med Personliga dokument"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
@@ -2335,7 +2373,7 @@ msgstr "Ordförklaringar"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
-msgstr "Erkännande"
+msgstr "Tack till"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
@@ -2383,37 +2421,36 @@ msgstr "Huvudtext"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
-msgstr "%s formaterade böcker stöds inte"
+msgstr "%s-formaterade böcker stöds inte"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
-msgstr "HTML TOC genereringsalternativ."
+msgstr "Alternativ för innehållsförteckning från HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
-msgstr "Bokomslagspapper"
+msgstr "Skyddsomslag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/split.py:34
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
-"Kunde inte hitta en rimlig plats för att dela upp: %s  Underträdsstorlek: %d "
-"KB"
+"Kunde inte hitta någon lämplig plats att dela texten på: %s  "
+"Underträdsstorlek: %d KiB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
-msgstr "OPF/NCX/etc. genereringsalternativ."
+msgstr "Alternativ för att skapa OPF/NCX/etc."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
-msgstr "OPF version att generera. Grundinställning är %default."
+msgstr "OPF-version att generera. Grundinställning är %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr ""
-"Generera en Adobe \"sidaomvandlings\" fil om sidnumreringsinformation finns "
-"tillgänglig."
+"Generera en Adobe \"sidaomvandlings\"-fil om sidnummer finns tillgängliga."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
@@ -2431,8 +2468,7 @@ msgid ""
 "it will assume that every line represents a paragraph instead."
 msgstr ""
 "Calibre behandlar normalt tomma rader som styckesmarkörer. Med detta "
-"alternativ kommer det att utgå ifrån att varje rad motsvarar ett stycke "
-"istället."
+"alternativ kommer i stället varje rad att behandlas som ett stycke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
@@ -2444,25 +2480,25 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 "Calibre behandlar normalt tomma rader som styckesmarkörer. Med detta "
-"alternativ kommer det att förutsätta att alla rader börjar med ett indrag "
-"(antingen ett tabulatorsteg eller 2+ mellanslag) representerar ett stycke. "
+"alternativ kommer istället alla rader som börjar med ett indrag (antingen "
+"ett tabulatorsteg eller fler än två mellanslag) att representera ett stycke. "
 "Stycken slutar när nästa rad som börjar med ett indrag nås."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
-msgstr "Format för användning inne i pdb container. Alternativen är:"
+msgstr "Format för användning inne i PDB-containern. Alternativen är:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27
 msgid ""
 "Specify the character encoding of the output document. The default is "
 "cp1252. Note: This option is not honored by all formats."
 msgstr ""
-"Ange vilken teckenkodning av produktionen dokumentet. Standard är cp1252. "
-"Obs: Detta alternativ är inte uppskattat av alla format."
+"Ange teckenkodning för utdokumentet. Standard är cp1252. Obs: Detta "
+"alternativ är inte uppskattat av alla format."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
-msgstr "Extraherar inte bilder från dokumentet"
+msgstr "Extrahera inte bilder från dokumentet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:26
 msgid ""
@@ -2470,13 +2506,13 @@ msgid ""
 "Valid values are a decimal between 0 and 1. The default is 0.5, this is the "
 "median line length."
 msgstr ""
-"Skala som används för att bestämma längden på vilken en rad bör radbrytas. "
-"Giltiga värden är ett decimaltal mellan 0 och 1. Standardvärdet är 0,5, som "
-"är mediaradslängd."
+"Skala som används för att bestämma var raden skall brytas. Giltiga värden är "
+"ett decimaltal mellan 0 och 1. Standardvärdet är 0,5, som är radens "
+"medianlängd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
-msgstr "Använd den nya PDF-konverteringsmotor."
+msgstr "Använd den nya PDF-konverteringsmotorn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
@@ -2507,7 +2543,7 @@ msgid ""
 msgstr ""
 "[alternativ] file.pdf\n"
 "\n"
-"Beskära en PDF-fil.\n"
+"Beskär en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:38
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
@@ -2519,35 +2555,37 @@ msgstr ""
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
-"Sökväg till utfil. Som standard skapas en fil i den aktuella katalogen."
+"Sökväg till utfil. Som standard skapas filen i den aktuella katalogen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:41
 msgid "Number of pixels to crop from the left most x (default is %s)"
 msgstr ""
-"Antal bildpunkter att beskära från mest vänstra x (grundinställning är %s)"
+"Antal bildpunkter att beskära från det mest vänstra x (grundinställning är "
+"%s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:44
 msgid "Number of pixels to crop from the left most y (default is %s)"
 msgstr ""
-"Antal bildpunkter att beskära från mest vänstra y (grundinställning är %s)"
+"Antal bildpunkter att beskära från det mest vänstra y (grundinställning är "
+"%s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47
 msgid "Number of pixels to crop from the right most x (default is %s)"
 msgstr ""
-"Antal bildpunkter att beskära från mest högra x (grundinställning är %s)"
+"Antal bildpunkter att beskära från det mest högra x (grundinställning är %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50
 msgid "Number of pixels to crop from the right most y (default is %s)"
 msgstr ""
-"Antal bildpunkter att beskära från mest högra y (grundinställning är %s)"
+"Antal bildpunkter att beskära från det mest högra y (grundinställning är %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53
 msgid ""
 "A file generated by ghostscript which allows each page to be individually "
 "cropped `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`"
 msgstr ""
-"En fil som genereras av ghostscript som tillåter varje sida att individuelt "
-"beskäras `gs-dSAFER-dNOPAUSE-dBATCH-sDEVICE = bbox file.pdf 2> bounding\""
+"En fil som genereras av ghostscript och som tillåter att varje sida beskärs "
+"individuelt `gs-dSAFER-dNOPAUSE-dBATCH-sDEVICE = bbox file.pdf 2> bounding`"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
@@ -2561,7 +2599,7 @@ msgstr "Beskärningsalternativ:"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Options to control the transformation of pdf"
-msgstr "Alternativ för att kontrollera omvandlingen av pdf"
+msgstr "Alternativ för att kontrollera PDF-konverteringen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
@@ -2569,9 +2607,9 @@ msgid ""
 "\n"
 "Decrypt a PDF.\n"
 msgstr ""
-"[alternativ] file.pdf lösenord\n"
+"[alternativ] fil.pdf lösenord\n"
 "\n"
-"Dekryptera en PDF.\n"
+"Dekryptera en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
@@ -2583,9 +2621,9 @@ msgid ""
 "\n"
 "Encrypt a PDF.\n"
 msgstr ""
-"[alternativ] file.pdf lösenord\n"
+"[alternativ] fil.pdf lösenord\n"
 "\n"
-"Kryptera en PDF.\n"
+"Kryptera en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
@@ -2597,11 +2635,13 @@ msgid ""
 "\n"
 "Get info about a PDF.\n"
 msgstr ""
-"file.pdf ...\n"
+"fil.pdf ...\n"
 "\n"
-"Få info om en PDF.\n"
+"Få info om en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Författare"
 
@@ -2633,7 +2673,7 @@ msgid ""
 "\n"
 "Merges individual PDFs.\n"
 msgstr ""
-"[alternativ] file1.pdf file2.pdf ...\n"
+"[alternativ] fil1.pdf fil2.pdf ...\n"
 "\n"
 "Metadata kommer att användas från den först angivna PDF-filen.\n"
 "\n"
@@ -2641,7 +2681,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
-msgstr "Sammanslagningsalternativ:"
+msgstr "Alternativ för sammanfogning:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
@@ -2669,7 +2709,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
-msgstr "Roteringsalternativ:"
+msgstr "Rotationsalternativ:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
@@ -2686,57 +2726,57 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 "\n"
-"%prog %%name [alternativ] file.pdf sida att dela på ...\n"
-"%prog %%name [alternativ] file.pdf sidintervall att dela på ...\n"
+"%prog %%name [alternativ] fil.pdf sida att dela på ...\n"
+"%prog %%name [alternativ] fil.pdf sidintervall att dela vid ...\n"
 "\t\n"
 "Ex.\n"
 "\t\n"
-"%prog %%name file.pdf 6\n"
-"%prog %%name file.pdf 6-12\n"
-"%prog %%name file.pdf 6-12 8 10 9-20\n"
+"%prog %%name fil.pdf 6\n"
+"%prog %%name fil.pdf 6-12\n"
+"%prog %%name fil.pdf 6-12 8 10 9-20\n"
 "\n"
 "Dela en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
-msgstr "Delningsalternativ:"
+msgstr "Alternativ för delning:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31
 msgid ""
 "The unit of measure. Default is inch. Choices are %s Note: This does not "
 "override the unit for margins!"
 msgstr ""
-"Mätenhet. Standard är tum. Val är %s Notera: Detta är inte överridas enheten "
-"för marginaler!"
+"Måttenhet. Standard är tum. Alternativen är %s OBS: Detta åsidosätter inte "
+"enheten för marginalerna!"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36
 msgid ""
 "The size of the paper. This size will be overridden when an output profile "
 "is used. Default is letter. Choices are %s"
 msgstr ""
-"Storleken på papperet. Denna storlek kommer att överridas när en "
-"utdataprofil används. Standard är brev. Val är %s"
+"Storleken på papperet. Denna storlek kommer att åsidosättas när en "
+"utdataprofil används. Standard är brev (US letter). Alternativen är %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40
 msgid ""
 "Custom size of the document. Use the form widthxheight EG. `123x321` to "
 "specify the width and height. This overrides any specified paper-size."
 msgstr ""
-"Anpassad storleken på dokumentet. Använd formuläret bredd x höjd ex.. "
-"\"123x321\" för att ange bredd och höjd. Detta överrider specificerad "
+"Anpassad storleken på dokumentet. Använd formatet breddxhöjd t.ex.. "
+"\"123x321\" för att ange bredd och höjd. Detta åsidosätter angiven "
 "pappersstorlek."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
-msgstr "Orientering av sidan. Standard är porträtt. Val är %s"
+msgstr "Sidorientering. Standard är porträtt. Alternativen är %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
 msgid ""
 "Preserve the aspect ratio of the cover, instead of stretching it to fill the "
 "ull first page of the generated pdf."
 msgstr ""
-"Bevara bildformat för omslaget, i stället för töja det för att fylla ull "
-"första sidan i den genererade pdf."
+"Behåll omslagets proportioner istället för att töja ut det över hela första "
+"sidan i den skapade PDF-filen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
@@ -2745,7 +2785,7 @@ msgstr "Kunde inte hitta pdftohtml, kolla om det finns i din PATH"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:33
 msgid ""
 "Specify the character encoding of the output document. The default is cp1252."
-msgstr "Ange vilken teckenkodning för utdokumentet. Standard är cp1252."
+msgstr "Ange teckenkodning för utdokumentet. Standard är cp1252."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:199
 msgid ""
@@ -2753,14 +2793,14 @@ msgid ""
 "first and then try it.\n"
 "%s"
 msgstr ""
-"Detta RTF-fil har en funktion kaliber inte stöder. Konvertera det till HTML "
-"och sedan prova det.\n"
+"Denna RTF-fil har en funktion Calibre inte stöder. Konvertera det till HTML "
+"och försök igen.\n"
 "%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23
 msgid ""
 "Specify the character encoding of the output document. The default is utf-8."
-msgstr "Ange vilken teckenkodning för utdokumentet. Standardvärdet är UTF-8."
+msgstr "Ange teckenkodning för utdokumentet. Standardvärdet är UTF-8."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:27
 msgid ""
@@ -2768,9 +2808,9 @@ msgid ""
 "compression but the fastest and 10 being the highest compression but the "
 "slowest."
 msgstr ""
-"Specificera komprimeringsnivå som ska användas. Skalan är från 1 till 10. 1 "
-"är den lägsta komprimeringen, men den snabbaste och 10 är den högsta "
-"komprimeringen, men långsammast."
+"Ange komprimeringsnivå. Skalan är från 1 till 10, där 1 är den lägsta "
+"komprimeringen men snabbaste komprimeringen, och 10 är den högsta och "
+"långsammaste komprimeringen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
 msgid ""
@@ -2790,7 +2830,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
 msgid "Do not insert a Table of Contents into the output text."
-msgstr "Sätt inte en innehållsförteckning i uttexten."
+msgstr "Infoga ingen innehållsförteckning i den skapade texten."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24
 msgid ""
@@ -2798,18 +2838,18 @@ msgid ""
 "for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. "
 "'system' will default to the newline type used by this OS."
 msgstr ""
-"Typ av nyradstecken att använda. Alternativen är %s. Grundinställning är "
-"\"system\". Använd \"old_mac\" för kompatibilitet med Mac OS 9 och tidigare. "
-"För Mac OS X använder \"unix\". \"system\" för standard av nyradsteckenstyp "
-"som används i detta OS."
+"Ange vilket tecken som skall markera ny rad. Alternativen är %s. "
+"Grundinställning är \"system\". Använd \"old_mac\" för kompatibilitet med "
+"Mac OS 9 och tidigare. För Mac OS X använder \"unix\". Om \"system\" anges "
+"används samma nyradstyp som i operativsystemet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:30
 msgid ""
 "Specify the character encoding of the output document. The default is utf-8. "
 "Note: This option is not honored by all formats."
 msgstr ""
-"Ange vilken teckenkodning för utdokumentet. Grundinställning är UTF-8. Obs: "
-"Detta alternativ är inte accepterat av alla format."
+"Ange teckenkodning den skapade texten. Grundinställning är utf-8. Obs: Detta "
+"alternativ är accepteras inte av alla format."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:38
 msgid ""
@@ -2818,35 +2858,37 @@ msgid ""
 "the space after and will exceed the specified value. Also, there is a "
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
-"Det maximala antalet tecken per rad. Detta delar upp på första mellanrummet "
-"före det angivna värdet. Om ingen mellanrum finns linjen kommer att brytas "
-"på plats efter och kommer att överstiga det angivna värdet. Dessutom finns "
-"det minst 25 tecken. Använd 0 för att inaktivera linjeuppdelning."
+"Det maximala antalet tecken per rad. Raden bryts vid det första mellanrummet "
+"före det angivna värdet. Om inget mellanrum finns kommer raden att brytas "
+"vid nästa mellanrum och kommer då att överstiga det angivna värdet. Det "
+"minsta möjliga värdet är 25 tecken. Använd 0 för att inaktivera "
+"radbrytningar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:45
 msgid ""
 "Force splitting on the max-line-length value when no space is present. Also "
 "allows max-line-length to be below the minimum"
 msgstr ""
-"Tvingaduppdelning på max-radlängds värdet när inget utrymme finns. Även "
-"tillåter max-radlängd att vara under den minsta"
+"Tvinga radbrytning vid den maximala radlängden, även om inget mellanrum "
+"finns. Tillåter även den maximala radlängen att ligga under minimigränsen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
-"Skicka fil till lagring på kort istället för primärminne som standard"
+"Skicka som standard filen till minneskortet i stället för till det inbyggda "
+"minnet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
-msgstr "Bekräfta innan borttagning"
+msgstr "Bekräfta före borttagning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
-msgstr "Toolbar ikonstorlek"
+msgstr "Ikonstorlek för verktygsfältet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
-msgstr "Visa knappbeteckningar i verktygsfältet"
+msgstr "Visa textetiketter vid knapparna i verktygsfältet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
@@ -2858,15 +2900,15 @@ msgstr "Meddela när en ny version finns tillgänglig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Use Roman numerals for series number"
-msgstr "Använd romerska siffror för serienummer"
+msgstr "Använd romerska siffror för nummer i serien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "Sortera taglista efter popularitet"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
-msgstr "Antal omslag att visas på omslagsbläddringsvy"
+msgstr "Antal omslag att visa i omslagsbläddraren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
@@ -2874,11 +2916,11 @@ msgstr "Standardvärden för konvertering till LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
-msgstr "Alternativ för LRF e-bokläsaren"
+msgstr "Alternativ för LRF-läsaren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Formats that are viewed using the internal viewer"
-msgstr "Format som visas med den intern läsare"
+msgstr "Format som visas med den interna läsaren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Columns to be displayed in the book list"
@@ -2886,40 +2928,39 @@ msgstr "Antal kolumner som ska visas i boklistan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
 msgid "Automatically launch content server on application startup"
-msgstr "Automatiskt starta mediaservern vid programuppstart"
+msgstr "Starta automatiskt medieservern när programmet startas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Oldest news kept in database"
-msgstr "Äldsta nyheter som finns i databasen"
+msgstr "De äldsta nyheter som ska behållas i databasen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Show system tray icon"
-msgstr "Visa systemfältsikonen"
+msgstr "Visa en ikon i systemfältet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
-msgstr "Ladda upp nerladdade nyheter till enheten"
+msgstr "Skicka hämtade nyheter till enheten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
-msgstr "Ta bort böcker från biblioteket efter uppladdning till enheten"
+msgstr "Ta bort böcker från biblioteket efter att de skickats till enheten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
-"Visa omslagsbäddring i ett separat fönster istället för i calibre's "
+"Visa omslagsbläddraren i ett separat fönster i stället för i Calibres "
 "huvudfönster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
 msgid "Disable notifications from the system tray icon"
-msgstr "Inaktivera meddelande från systemfältsikonen"
+msgstr "Inaktivera meddelanden från ikonen i systemfältet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
 msgid "Default action to perform when send to device button is clicked"
-msgstr ""
-"Standard åtgärd att utföra när 'skicka till enheten'  knappen klickas"
+msgstr "Standardåtgärd som knappen \"skicka till enhet\"  skall utföra"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
@@ -2927,7 +2968,7 @@ msgstr "Maximalt antal väntande bearbetningsprocesser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
-msgstr "Hämta social metadata (taggar/betyg/m.m.)"
+msgstr "Hämta sociala metadata (etiketter/betyg/m.m.)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Overwrite author and title with new metadata"
@@ -2935,29 +2976,445 @@ msgstr "Skriv över författare och titel med nya metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "Limit max simultaneous jobs to number of CPUs"
-msgstr "Övre maximumgräns på samtidiga jobb till antalet CPUer"
+msgstr "Maximalt antal samtidiga jobb till samtliga processorer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
 msgid "tag browser categories not to display"
+msgstr "Kategorier som inte skall visas i etikettbläddraren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "Gränssnittets utseende"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopierad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
-msgstr "Kopiera till klippbordet"
+msgstr "Kopiera till urklipp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "Välj filer"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "Använd bara bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "Användaranteckningar genereras endast från huvudbiblioteket"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "Inga böcker har valts"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "Inga böcker har valts att hämta anteckningar från"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "Sammanfogar användaranteckningar till databasen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />Senaste lästa sidan: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />Senaste lästa sidan: Plats %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Plats %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Sidan %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Plats %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "Hur många tomma böcker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "Hur många tomma böcker ska läggas till?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "Skickar böcker till enhet."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "Böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Topaz-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "Textböcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF-böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "Serier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "Arkiv"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "Stödda böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "Sammanfoga flera böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+"Vissa dubbletter hittades och fördes in i följande existerande böcker:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "Kunde inte läsa metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "Kunde inte läsa metadata från följande"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "Inga böcker har valts"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "Kan inte ta bort"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "Välj format att ta bort"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Välj format att <b>inte</b> ta bort"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr "Minneskort A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr "Minneskort B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "Tar bort böcker från enheten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"De valda böckerna kommer att <b>tas bort permanent</b> och filerna kommer "
+"att raderas från datorn. Är du säker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"De utvalda böckerna kommer att <b> tas bort permanent </b> från enheten. Är "
+"du säker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "Kan inte hämta metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "sociala metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "Hämtar %s för %d böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "Alla metadata kunde inte hämtas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "Kunde inte hämta metadata för följande:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "Kunde inte hämta metadata:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Fel"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "Kan inte redigera metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "Kan inte sammanfoga böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "Minst två böcker måste väljas för att de skall fogas samman"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Alla bokformat och metadata från de valda böckerna kommer att läggas till "
+"den <b>första valda boken.</b><br><br>Den andra och övriga valda böcker "
+"kommer inte att tas bort eller ändras.<br><br>Vänligen bekräfta att du vill "
+"fortsätta."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Alla bokformat och metadata från de valda böckerna kommer att sammanfogas i "
+"<b>den första valda boken</b>.<br><br>Efter sammanslagningen kommer övriga "
+"valda böcker att <b>tas bort</b>. <br><br> Alla bokformat av den första "
+"valda boken kommer att behållas, medan varje dublettformat i övriga valda "
+"böcker kommer att <b>tas bort permanent</b>från din dator.<br><br> Är du "
+"<b>säker</b> på att du vill fortsätta?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Du håller på att sammanfoga fler än fem böcker. Är du <b>säker</b> på att du "
+"vill fortsätta?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Kan inte spara till disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "Välj målmapp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "Fel uppstod när filen skulle sparas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "Det uppstod ett fel när filen skulle sparas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "Vissa böcker kunde inte sparas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "Klicka på knappen \"Visa detaljer\" för att se vilka."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "Inga böcker har valts att skapa katalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "Skapar %s-katalog..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Inga böcker hittades"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"Inga böcker till katalog\n"
+"Kontrollera uteslutna etiketter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "Katalog genererad."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "Exportkatalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "Välj destination för %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "Hämtar nyheter från "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " hämtade."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "Kan inte konvertera"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "Påbörjar konvertering av %d böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "Kan inte visa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Välj format att visa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "Flera böcker valda"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+"Du försöker öppna %d böcker. Att öppna för många böcker på en gång kan både "
+"vara långsamt och ha en negativ inverkan på svarstiderna hos din dator. När "
+"väl process startats kan den inte stoppas förrän den är klar. Vill du "
+"fortsätta?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "Kan inte öppna mapp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s har inga tillgängliga format."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Söker i"
@@ -2979,31 +3436,26 @@ msgid "The specified directory could not be processed."
 msgstr "Den angivna katalogen kunde inte behandlas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Inga böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1929
-msgid "No books found"
-msgstr "Inga böcker funna"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Tillagd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
-msgstr "Lägga till misslyckades"
+msgstr "Kunde inte lägga till"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:341
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
-"\"Lägg till böcker\" processen verkar ha låst sig. Försök att starta om "
-"calibre och lägg till böcker i mindre steg, tills du hittar boken som ger "
-"problemet."
+"Processen som lägger till böcker verkar ha låst sig. Försök att starta om "
+"Calibre och lägga till böcker i mindre steg, tills du hittar boken som ger "
+"upphov till problemet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
@@ -3014,8 +3466,8 @@ msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
-"Böcker med samma titel som följande finns redan i databasen. Lägga till dem "
-"i alla fall?"
+"Böcker med samma titel som följande finns redan i databasen. Skall de ändå "
+"läggas till?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
@@ -3027,7 +3479,7 @@ msgstr "Sparar..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
-msgstr "Sparad"
+msgstr "Sparat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
 msgid "Searching for sub-folders"
@@ -3121,17 +3573,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -3150,17 +3602,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3184,9 +3636,61 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr "Flera böcker per &mapp, antar varje ebokfil är en annorlunda bok"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "Sökväg"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr "Samlingar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr "Klicka för att öppna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "Inget"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
-msgstr "CSV/XML alternativ"
+msgstr "Alternativ för CSV/XML"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
@@ -3243,7 +3747,7 @@ msgstr "utdata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -3253,34 +3757,34 @@ msgstr "Formulär"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
-msgstr "Fält för att inkludera i utdata::"
+msgstr "Fält för att inkludera i utdata:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
-msgstr "E-book alternativ"
+msgstr "Alternativ för e-böcker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
 msgid "'Don't include this book' tag:"
-msgstr "\"Inkludera inte in den här boken\" etikett:"
+msgstr "\"Inkludera inte in den här boken\"-etikett:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
 msgid "'Mark this book as read' tag:"
-msgstr "\"Markera den här boken som läst\" etikett:"
+msgstr "\"Markera den här boken som läst\"-etikett:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
-msgstr "Kompletterande märketikettsprefix:"
+msgstr "Kompletterande prefix för anteckningsetiketter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
 msgid "Regex pattern describing tags to exclude as genres:"
-msgstr "Regex mönster beskriver etiketter för att utesluta genrer:"
+msgstr "Regex-mönster som beskriver etiketter för att utesluta genrer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
 msgid ""
@@ -3290,19 +3794,19 @@ msgid ""
 "- A regex pattern of a single dot excludes all genre tags, generating no "
 "Genre Section"
 msgstr ""
-"Regex tips:\n"
-"- Standard regex - \\ [[\\ w] * \\] - utesluter genre etiketter form [tag], "
-"t.ex. [Amazon Freebie]\n"
-"- Ett reguljärt mönster av en enda punkt utesluter alla genre etiketter, "
-"alstra inget Genre avsnitt"
+"Regex-tips:\n"
+"- Standardregex - \\ [[\\ w] * \\] - utesluter genreetiketter med formen "
+"[tag], t.ex. [Amazon Freebie]\n"
+"- Ett reguljärt mönster av en enda punkt utesluter alla genreetiketter och "
+"alstrar inget genreavsnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
-msgstr "Inkludera \"titlar\" avsnitt"
+msgstr "Inkludera avsnittet \"titlar\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
-msgstr "Inkludera \"Nyligen tillagda\" avsnitt"
+msgstr "Inkludera avsnittet \"nyligen tillagda\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
@@ -3310,7 +3814,7 @@ msgstr "Sortera tal som text"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
-msgstr "Tab mall för catalog.ui"
+msgstr "Tabbmall för catalog.ui"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:36
 msgid ""
@@ -3318,9 +3822,9 @@ msgid ""
 "in a previous conversion (if they exist) instead of using the defaults "
 "specified in the Preferences"
 msgstr ""
-"För inställningar som inte kan anges i den här dialogrutan, använd värden "
-"som sparats i en tidigare omvandling (om de finns) istället för att använda "
-"standardvärden som anges i Inställningar"
+"För inställningar som inte kan anges i den här dialogrutan, använd värdena "
+"som sparats i en tidigare konvertering (om den finns) i stället för att "
+"använda de standardvärden som anges i Inställningar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
@@ -3356,22 +3860,22 @@ msgstr "Inaktivera &normalisering"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Keep &aspect ratio"
-msgstr "Behåll &proportion"
+msgstr "Behåll &proportioner"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "Disable &Sharpening"
-msgstr "Inaktivera &Skärpa"
+msgstr "Inaktivera &skärpeförbättring"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
-msgstr "Inaktivera &Beskärning"
+msgstr "Inaktivera &beskärning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
 msgid "&Wide"
-msgstr "&Vidd"
+msgstr "&Bred"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
@@ -3404,7 +3908,7 @@ msgstr "&Utformat:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
 msgid "Disable conversion of images to &black and white"
-msgstr "Inaktivera konvertering av bilder till och svartvitt"
+msgstr "Inaktivera konvertering av bilder till svartvitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
@@ -3412,7 +3916,7 @@ msgstr "Felsök"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
-msgstr "Felsök omvandlingsprocessen."
+msgstr "Felsök konverteringsprocessen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:51
@@ -3425,7 +3929,7 @@ msgstr "Ogiltig felsökningskatalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
-msgstr "Misslyckades att skapa felsökningskatalog"
+msgstr "Kunde inte skapa felsökningskatalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:50
 msgid ""
@@ -3434,11 +3938,11 @@ msgid ""
 "understanding the conversion process and figuring out the correct values for "
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
-"Välj en mapp att sätta debuginformationen in. Om du anger en mapp kommer "
-"calibre läggea stor dela av debuginformationen in i den. Detta kommer att "
-"vara användbart för att förstå omvandlingsprocessen och räkna ut rätt värden "
-"för konverteringsparametrar såsom innehållsförteckning och kapitel "
-"Detektering."
+"Välj en mapp att skriva felsökningsinformation till. Om du anger en mapp "
+"kommer Calibre skriva massa felsökningsinformation till den. Detta kommer "
+"att vara användbart för att förstå konverteringsprocessen och räkna ut "
+"korrekta värden för konverteringsinställningar som innehållsförteckning och "
+"kapiteldetektering."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 msgid ""
@@ -3446,21 +3950,21 @@ msgid ""
 "of the conversion process. This HTML can sometimes serve as a good starting "
 "point for hand editing a conversion."
 msgstr ""
-"Den felsökningsprocessen matar ut HTML resultat som genereras vid olika "
-"skeden av omvandlingsprocessen. Denna HTML kan ibland tjäna som en bra "
-"utgångspunkt för handredigera en omvandling."
+"Felsökningsprocessen matar ut HTML-resultat som genererats vid olika skeden "
+"av konverteringsprocessen. Denna HTML kan ibland vara en bra utgångspunkt "
+"för att redigera konverteringen manuellt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
-msgstr "EPUB utdata"
+msgstr "EPUB-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
-msgstr "Dela inte på &sidbrytningar"
+msgstr "Dela inte vid &sidbrytningar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
-msgstr "Inget standard &omslag"
+msgstr "Inget standard&omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
@@ -3468,7 +3972,7 @@ msgstr "Inget omslag i &SVG-format."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
-msgstr "Behåll omslags &aspect förhållande"
+msgstr "Behåll omslagets &proportioner"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
@@ -3476,30 +3980,30 @@ msgstr "Dela fi&ler och större än:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
-msgstr " KB"
+msgstr " KiB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
-msgstr "FB2 Indata"
+msgstr "FB2-indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:29
 msgid "Do not insert a &Table of Contents at the beginning of the book."
-msgstr "Sätt inte in en innehållsför&teckning i början av boken."
+msgstr "Infoga ingen innehållsförteckning i början av boken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
-msgstr "FB2 utdata"
+msgstr "FB2-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:29
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:37
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:29
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:47
 msgid "&Inline TOC"
-msgstr "&Innehållsförteckning på raden"
+msgstr "&Innehållsförteckning inuti boken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
-msgstr "Typsnittsomskalningsguide"
+msgstr "Guide för att omskala teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:100
 msgid ""
@@ -3516,32 +4020,32 @@ msgid ""
 "ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> "
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
-"<p> Guiden hjälper dig välja en lämplig teckenstorleksnyckel för dina behov. "
-"Skriv bara in basteckenstorleken av ingående dokument och sedan ange en "
-"teckenstorleken. Guiden kommer att visa vilken teckenstorlek som kommer att "
-"användas för omskalningsalgoritmen för teckensnittet. Du kan justera "
-"algoritmen genom att justera utbasteckenstorleken och typsnittsnyckel nedan. "
-"När du hittar värden som passar dig, klicka på OK. </p>\n"
-"<p> Som standard om basteckenstorleken ut är noll och / eller ingen "
-"typsnittsnyckel anges, calibre kommer att använda värdena från den aktuella "
-"utprofilen. </p>\n"
-"<p> Se <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-"
+"<p>Guiden hjälper dig välja en lämplig teckenstorleksnyckel utifrån dina "
+"behov. Skriv bara in basteckenstorleken för det ingående dokumentet och ange "
+"teckenstorleken i ingångsdokumentet. Guiden kommer att visa vilken "
+"teckenstorlek som kommer att användas för omskalningsalgoritmen. Du kan "
+"justera algoritmen genom att justera basteckenstorleken för utdata och "
+"typsnittsnyckel nedan. När du hittar värden som passar dig, klicka på OK. "
+"</p>\n"
+"<p>Om basteckenstorleken ut är noll och/eller ingen typsnittsnyckel anges, "
+"kommer Calibre kommer att använda värdena från den aktuella utprofilen.</p>\n"
+"<p>Se <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-"
 "size-rescaling\"> Bruksanvisning </a> för en beskrivning om hur "
-"teckenstorleksomskalning fungerar. < /p>"
+"teckenstorleksomskalning fungerar.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
-msgstr "Utd&ocument"
+msgstr "Utd&okument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109
 msgid "&Base font size:"
-msgstr "&Bastypsnittsstorlek"
+msgstr "&Basteckenstorlek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
 msgid "Font size &key:"
-msgstr "Typsnittsstorleks nyc&kel"
+msgstr "Teckenstorleksnyc&kel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
@@ -3556,7 +4060,7 @@ msgstr "Typsnittsstorleks nyc&kel"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127
 msgid " pt"
-msgstr " pt"
+msgstr " punkter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
@@ -3568,7 +4072,7 @@ msgstr "&Indokument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
-msgstr "&Typsnittsstorlek: "
+msgstr "&Teckenstorlek: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
@@ -3576,15 +4080,15 @@ msgstr " kommer omvandlas till storlek: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
-msgstr "0.0 pt"
+msgstr "0.0 punkter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
-msgstr "Utseende och känsla"
+msgstr "Utseende"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
 msgid "Control the look and feel of the output"
-msgstr "Styr utseendet och känslan av utdata"
+msgstr "Styr hur det utgående dokumentet kommer att se ut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
@@ -3592,15 +4096,15 @@ msgstr "Ursprunglig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
-msgstr "Vänsterställ"
+msgstr "Vänsterjustera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
-msgstr "Justera text"
+msgstr "Marginaljustera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
-msgstr "&Inaktivera teckenstorleksomskalning"
+msgstr "Skala inte om teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
@@ -3608,7 +4112,7 @@ msgstr "Basteckenstorlek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
 msgid "Wizard to help you choose an appropriate font size key"
-msgstr "Guiden som hjälper dig att välja en lämplig teckenstorleksnyckel"
+msgstr "En guide som hjälper dig att välja en lämplig teckenstorleksnyckel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
@@ -3616,15 +4120,15 @@ msgstr "Rad&höjd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
-msgstr "Kodning av intecken:"
+msgstr "Teckenkodning för indata:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
-msgstr "Ta bort & styckeavstånd"
+msgstr "Ta bort blankrad mellan stycken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
-msgstr "Indenteringslängd:"
+msgstr "Indragslängd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
 msgid ""
@@ -3632,9 +4136,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
-"<p> När calibre tar bort styckesavstånd ställer det automatiskt ett "
-"styckesindraget, för att säkerställa att punkterna kan lätt skiljas. Det här "
-"alternativet styr bredden på nämnda indraget."
+"<p>När blankrader tas bort mellan stycken görs automatiskt ett indrag på "
+"första raden i stycket därpå, så att styckena kan skiljas åt. Detta "
+"alternativ bestämmer storleken på detta indrag."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
@@ -3646,7 +4150,7 @@ msgstr "Textjustering:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
-msgstr "&Linearisera tabeller"
+msgstr "Omvandla data i tabeller till linjära data"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
@@ -3654,11 +4158,11 @@ msgstr "Extra &CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
-msgstr "&Translitterera Unicode-tecken till ASCII"
+msgstr "&Transkribera Unicode-tecken till ASCII"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
-msgstr "Infoga  blankrad"
+msgstr "Infoga blankrad"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
@@ -3666,11 +4170,11 @@ msgstr "Behåll &ligaturer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
-msgstr "LRF utdata"
+msgstr "LRF-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
-msgstr "Aktivera &autorotation av breda bilder"
+msgstr "Rotera breda bilder &automatiskt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
@@ -3678,15 +4182,15 @@ msgstr "Ordutrymme:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
-msgstr "Minimum styckes&indrag:"
+msgstr "Minsta styckes&indrag:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
-msgstr "Framställ &tabeller som bilder"
+msgstr "Rendera tabeller som bilder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:122
 msgid "Text size multiplier for text in rendered tables:"
-msgstr "Textstorleksmultiplikator för text i framställda tabeller:"
+msgstr "Textstorleksmultiplikator för text i renderade tabeller:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
@@ -3702,19 +4206,19 @@ msgstr "Rubrik&format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
-msgstr "Inbyggda teckensnitt"
+msgstr "Bädda in teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
-msgstr "&Serif typsnittsfamilj:"
+msgstr "Familj för &Serif-teckensnitt:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
-msgstr "S&ans-serif typsnittsfamilj:"
+msgstr "Familj för S&ans-serif-teckensnitt:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
-msgstr "&Monospaced typsnittsfamilj:"
+msgstr "Familj för fast bredd-teckensnitt:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114
@@ -3754,7 +4258,7 @@ msgstr "Fel vid läsningen av filen"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
 msgid "<p>There was an error reading from file: <br /><b>"
-msgstr "<p> Det uppstod ett fel vid läsning från fil: <br /> <b>"
+msgstr "<p> Det uppstod ett fel vid läsning från fil: <br /><b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126
@@ -3778,7 +4282,7 @@ msgstr "Ändra omslagsbild:"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
 msgid "Browse for an image to use as the cover of this book."
-msgstr "Bläddra till en bild att använda som omslaget till denna bok."
+msgstr "Bläddra till en bild att använda som omslag till denna bok."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
@@ -3798,14 +4302,14 @@ msgstr "Författare: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
-msgstr "Författare sortering:"
+msgstr "So&rtera författare efter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
-"Ändra författaren till denna bok. Flera författare ska avgränsas med ett "
+"Ändra författaren till denna bok. Flera författare ska avgränsas med "
 "kommatecken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
@@ -3817,7 +4321,7 @@ msgstr "Förlag: "
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "Ta&gs: "
-msgstr "Taggar: "
+msgstr "Etiketter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
@@ -3826,8 +4330,9 @@ msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
-"Taggar kategoriserar boken. Detta är särskilt användbart när du söker. <br> "
-"<br> De kan vara alla ord eller fraser, separerade med kommatecken."
+"Etiketter kategoriserar boken. Detta är särskilt användbart när du använder "
+"sökfunktionen. <br><br>Etiketter kan vara ord eller fraser och separeras med "
+"kommatecken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
@@ -3842,7 +4347,7 @@ msgstr "&Serier:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "List of known series. You can add new series."
-msgstr "Lista över kända serier. Du kan lägga till nya serie."
+msgstr "Lista över kända serier. Du kan lägga till nya serier."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
@@ -3851,7 +4356,7 @@ msgstr "Bok "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
-msgstr "MOBI utdata"
+msgstr "MOBI-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
@@ -3859,35 +4364,35 @@ msgstr "Grundinställning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
-msgstr "&Titel för Innehållsförteckning:"
+msgstr "&Titel för innehållsförteckningen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
-msgstr "Omskala bilder för &Palm-enheter"
+msgstr "Skala om bilder för &Palm-enheter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
-msgstr "Använd författare &sortera efter författare"
+msgstr "Använd författarens &sorteringsordning som författarnamn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
-msgstr "Inaktivera komprimering av filens innehåll"
+msgstr "Komprimera inte filinnehåll"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71
 msgid "Do not add Table of Contents to book"
-msgstr "Lägg inte till innehållsförteckningen för boken"
+msgstr "Lägg inte till någon innehållsförteckning i boken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
-msgstr "Kindle alternativ"
+msgstr "Alternativ för Kindle"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
-msgstr "Masthead teckensnitt:"
+msgstr "Teckensnitt för förstasidesrubriken på tidskrifter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
-msgstr "Personligt dokument märkning:"
+msgstr "Etikett för personliga dokument:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
@@ -3895,7 +4400,7 @@ msgstr "Sidinställning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
-msgstr "Utprofil:"
+msgstr "Profil för utdata:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
@@ -3903,7 +4408,7 @@ msgstr "Profilbeskrivning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
-msgstr "Inprofil"
+msgstr "Profil för indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
@@ -3927,7 +4432,7 @@ msgstr "Nederkant:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
-msgstr "PDB indata"
+msgstr "PDB-indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
@@ -3937,11 +4442,11 @@ msgstr "Behandla varje rad som ett stycke"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Assume print formatting"
-msgstr "Anta utskriftsformatering"
+msgstr "Antag att texten är formaterad för utskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
-msgstr "PDB utdata"
+msgstr "PDB-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
@@ -3949,7 +4454,7 @@ msgstr "&Format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
-msgstr "PDF indata"
+msgstr "PDF-indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
@@ -3961,7 +4466,7 @@ msgstr "&Inga bilder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
-msgstr "PDF utdata"
+msgstr "PDF-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
@@ -3973,24 +4478,19 @@ msgstr "&Orientering:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
-msgstr "Behåll omslags &aspect förhållande"
+msgstr "Behåll omslagets proportioner"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
-msgstr "RB utdata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2174
-msgid "Choose the format to view"
-msgstr "Välj format för visning"
+msgstr "RB-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
-msgstr "Kan inte bygga regex med GUI byggare utan en bok."
+msgstr "Kan inte bygga regex med grafisk byggare utan en bok."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "No formats available"
-msgstr "Inga format finns"
+msgstr "Inga tillgängliga format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
@@ -3998,15 +4498,15 @@ msgstr "Öppna bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
-msgstr "Regulära uttrycksbyggare"
+msgstr "Bygg reguljärt uttryck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
-msgstr "Förhandsgranskning"
+msgstr "Förhandsgranska"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
-msgstr "Regulära uttryck:"
+msgstr "Reguljärt uttryck:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
@@ -4019,7 +4519,7 @@ msgstr "Konvertera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
-msgstr "Alternativ specifika för de ingående formatet."
+msgstr "Alternativ specifika för det ingående formatet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
@@ -4034,44 +4534,44 @@ msgstr "&Informat:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
-msgstr "Använd &sparade inställningarna för omvandling av enskilda böcker"
+msgstr "Använd &sparade inställningar när enskilda böcker konverteras"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
-msgstr ""
-"Struktur\n"
-"Detektion"
+msgstr "Strukturdetektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:19
 msgid ""
 "Fine tune the detection of chapter headings and other document structure."
-msgstr "Finjustera upptäckt av kapitelrubrikerna och annan dokumentstruktur."
+msgstr ""
+"Finjustera hur kapitelrubriker och andra delar av dokumentstrukturen skall "
+"upptäckas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
-msgstr "Identifiera kapitel med (XPath uttryck):"
+msgstr "Identifiera kapitel med (XPath-uttryck):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
-msgstr "Infoga sidbrytningar innan (XPath uttryck):"
+msgstr "Infoga sidbrytningar före (XPath-uttryck):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
-msgstr "Sidhuvud reguljära uttryck:"
+msgstr "Reguljärt uttryck för sidhuvud:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
-msgstr "Sidfot reguljära uttryck:"
+msgstr "Reguljärt uttryck för sidfot:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "Ogiltigt reguljärt uttryck: %s"
 
@@ -4083,7 +4583,7 @@ msgstr "Ogiltig XPath"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39
 msgid "The XPath expression %s is invalid."
-msgstr "XPath-uttrycket %s är ogiltig."
+msgstr "XPath-uttrycket %s är ogiltigt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
@@ -4091,16 +4591,16 @@ msgstr "Kapitel&markering:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
-msgstr "Ta bord första bilden"
+msgstr "Ta bort första bilden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
-msgstr "Infoga &metadata som sida i början av boken"
+msgstr "Infoga &metadata som en sida i början av boken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
 msgid "&Preprocess input file to possibly improve structure detection"
 msgstr ""
-"Förbehandla indatafil för att eventuellt förbättra strukturen upptäckt"
+"Förbehandla indatafil för att lättare identifiera dokumentets struktur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
@@ -4108,7 +4608,7 @@ msgstr "Ta bort sidfot"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
-msgstr "Ta bort rubrik"
+msgstr "Ta bort sidhuvud"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
@@ -4118,27 +4618,27 @@ msgstr "Innehållsförteckning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18
 msgid "Control the creation/conversion of the Table of Contents."
-msgstr "Styr skapande / omvandling av innehållsförteckningen."
+msgstr "Styr hur innehållsförteckningen skapas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
-msgstr "Nivå &1 Innehållsförteckning (XPath uttryck):"
+msgstr "Nivå &1 i innehållsförteckningen (XPath-uttryck):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
-msgstr "Nivå  &2 Innehållsförteckning (XPath uttryck):"
+msgstr "Nivå &2 i innehållsförteckning (XPath-uttryck):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
-msgstr "Nivå  &3 Innehållsförteckning (XPath uttryck):"
+msgstr "Nivå &3 i innehållsförteckning (XPath-uttryck):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
-msgstr "Lägg inte funna kapitel till innehållsförteckningen"
+msgstr "Lägg inte till upptäcka kapitel i innehållsförteckningen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
-msgstr "Antal &länkar för att lägga till innehållsförteckningen"
+msgstr "Antal &länkar att lägga till i innehållsförteckningen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
@@ -4146,7 +4646,7 @@ msgstr "Kapitel&tröskel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
-msgstr "Påtvinga användning av automatiskt genererat Innehållsförteckning"
+msgstr "Använd alltid den automatiskt skapade innehållsförteckningen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
@@ -4154,11 +4654,11 @@ msgstr "Innehållsförtecknings&filter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
-msgstr "TXT indata"
+msgstr "TXT-indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Process using markdown"
-msgstr "Processen använder markdown"
+msgstr "Behandla med hjälp av markdown"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
 msgid ""
@@ -4166,13 +4666,13 @@ msgid ""
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
-"<p> Markdown är ett enkelt språk för uppmärkning av textfiler, som möjliggör "
-"avancerad formatering. Om du vill veta mer besök <a "
-"href=\"http://daringfireball.net/projects/markdown\"> markdown </a>."
+"<p>Markdown är ett enkelt språk för att formatera textfiler. Om du vill veta "
+"mer besök <a "
+"href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
 msgid "Do not insert Table of Contents into output text when using markdown"
-msgstr "Sätt inte innehållsförteckning i uttext när du använder markdown"
+msgstr "Skapa ingen innehållsförteckning om markdown används"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
 msgid "Preserve &spaces"
@@ -4180,7 +4680,7 @@ msgstr "Bevara &utrymme"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
-msgstr "TXT utdata"
+msgstr "TXT-utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
@@ -4188,7 +4688,7 @@ msgstr "Radslutsstil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
-msgstr "&Maximum radlängd:"
+msgstr "&Maximal radlängd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
@@ -4211,11 +4711,11 @@ msgstr "Använd en guide för att bygga XPath-uttrycket"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
-msgstr "Jämför HTML &taggar med namn:"
+msgstr "Jämför HTML-&taggar med namn:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
-msgstr "×"
+msgstr "*"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
@@ -4263,11 +4763,11 @@ msgstr "span"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
-msgstr "Använd &attributet:"
+msgstr "Med &attributet:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
-msgstr "Med &värde:"
+msgstr "Med &värdet:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
@@ -4282,19 +4782,26 @@ msgid ""
 "tag.</p><p>To learn more advanced usage of XPath see the <a "
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
-"<p> Till exempel, för att matcha alla h2 taggar som har class = \"kapitel\", "
-"ange tagg till <i> H2 </i>, attribut <i> class </i> och värde till <i> "
-"kapitel </i>. </p> Om attribut lämnas tomt matchar alla attribut och lämnas "
-"värdet tomt kommer att matcha alla värden. Ange tag till * så matchas alla "
-"taggar. </Strong> Om du vill veta mer avancerad användning av XPath se <a "
-"href=\"http://calibre-ebook.com/user_manual/xpath.html\"> XPath Tutorial < "
-"/a>."
+"<p>För att till exempel matcha alla h2-taggar som har class=\"kapitel\", "
+"sätt tagg till <i>h2</i>, attribut till <i>class</i> och värdet till "
+"<i>kapitel</i>.</p><p>Om attribut lämnas tomt matchas alla attribut, och "
+"lämnas värdet tomt matchas alla värden. Om * anges matchas alla "
+"taggar.</p><p>Om du vill veta mer avancerad användning av XPath se <a "
+"href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial< /a>."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr "Omslagsbläddraren kunde inte laddas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "Bläddra bland omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4315,287 +4822,299 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr "stjärna (or)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr "Ej Rankat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr "Ta bort alla taggar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr "taggar för att lägga till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr "taggar för att ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Inga detaljer tillgängliga."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
-msgstr "Enheten inte längre ansluten."
+msgstr "Enheten är inte längre ansluten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
-msgstr "Hämta enhetens informaton"
+msgstr "Hämta enhetsinformation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
-msgstr "Hämta lista över böcker på enheten"
+msgstr "Hämta en lista över böcker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "Hämta anteckningar från enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
-msgstr "Skicka metadata till enheten"
+msgstr "Skicka metadata till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
-msgstr "Ladda upp %d böcker till enheten"
+msgstr "Skicka %d böcker till enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
-msgstr "Ta bort böcker från enheten"
+msgstr "Ta bort böcker från enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
-msgstr "Hämta böcker från enheten"
+msgstr "Hämta böcker från enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "Visa böcker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
-msgstr "Ange skicka till enhet grundinställing"
+msgstr "Grundinställning för \"skicka till enhet\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "E-post till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr " och ta bort från biblioteket"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
-msgstr "Skicka till primärminnet"
+msgstr "Skicka till inbyggt minne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
-msgstr "Skicka till lagringskort A"
+msgstr "Skicka till minneskort A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
-msgstr "Skicka till lagringskort B"
+msgstr "Skicka till minneskort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr "Primärminne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr "Minneskort A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr "Minneskort B"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr "Skicka och ta bort från biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr "Skicka visst format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr "Anslut till mappen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr "Koppla ifrån mapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
-msgstr "Hämta anteckningar (experimental)"
+msgstr "Hämta anteckningar (experimentellt)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "Fel vid kommunikation med enheten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr "Välj mapp för att öppnas som enhet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr "Misslyckades"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "Kunde inte kommunicera med enheten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Det uppstod ett temporärt fel under kommunikation med enheten. Vänligen "
+"koppla ur och koppla in enheten igen och/eller starta om."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "Enhet: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " hittades"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "Ansluten "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "vald att skickas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "Välj format att skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "Ingen enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "Kan inte skicka: ingen enhet är ansluten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "Inget kort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
-msgstr "Kan inte skicka: Enhet har inget minneskort"
+msgstr "Kan inte skicka: Enheten har inget minneskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "E-bok:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
-msgstr "Bifogat, kommer du finna e-boken"
+msgstr "Bifogat, kommer du hitta e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
-msgstr "i %s formatet."
+msgstr "i %s-formatet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "Skickar e-post till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "Inga lämpliga format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
-msgstr ""
-"Automatisk omvandling av följande böcker innan de skickas via e-post?"
+msgstr "Skall böckerna konverteras automatiskt innan de skickas med e-post?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
-"Kunde inte skicka följande böcker eftersom inte något lämpligt format "
-"hittades:"
+"Kunde inte skicka följande böcker eftersom inget lämpligt format hittades:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
-msgstr "Misslyckades med att skicka böcker"
+msgstr "Kunde inte skicka böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
-msgstr "Misslyckades att skicka följande böcker:"
+msgstr "Kunde inte skicka följande böcker:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "Skickat via e-post:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "Nyheter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "Bifogat är"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "Skickat nyheter till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
-"Automatisk omvandling av följande böcker innan de laddas upp till enheten?"
+"Skall följande böcker konverteras automatiskt innan de skickas till enheten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
-msgstr "Skicka kataloger till enhet."
+msgstr "Skickar kataloger till enhet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
-msgstr "Skickar  nyheter till enheten."
+msgstr "Skickar nyheter till enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "Skickar böcker till enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
-"Kunde inte ladda upp följande böcker till enheten, eftersom inga lämpliga "
+"Kunde inte skicka följande böcker till enheten, eftersom inga lämpliga "
 "format hittades. Konvertera boken/böckerna till ett format som stöds av "
 "enheten först."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
-msgstr "Inte mer ledigt utrymme på enheten"
+msgstr "Inget ledigt utrymme på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
-"<p>Kan inte ladda upp böcker till enheten finns det inte mer ledigt utrymme "
+"<p>Kan inte skicka böcker till enheten finns det inte något ledigt utrymme "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
-msgstr "Välj tillgängliga format och prioritetsordning för att enheten"
+msgstr "Välj tillgängliga format och prioritetsordning för enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "Använd underkataloger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "Spara mall:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:991
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "Sökväg"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "Format"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "Anpassa omslag till visning"
@@ -4619,7 +5138,7 @@ msgstr "Generera katalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
-msgstr "Generera katalogen för {0} böcker"
+msgstr "Generera katalog för {0} böcker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
@@ -4629,7 +5148,7 @@ msgstr "Katalog&format:"
 msgid ""
 "Catalog &title (existing catalog with the same title will be replaced):"
 msgstr ""
-"Katalog &titel (befintlig katalog med samma titel kommer att ersättas):"
+"Katalog&titel (befintlig katalog med samma titel kommer att ersättas):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
@@ -4646,11 +5165,11 @@ msgstr "Välj format:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
 msgstr ""
-"Ange standardinställningar för konvertering av serier (CBR / CBZ filer)"
+"Ange standardinställningar för konvertering av serier (CBR-/CBZ-filer)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
-msgstr "Ange alternativ för konvertering %s"
+msgstr "Ange alternativ för att konvertera %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
@@ -4674,7 +5193,7 @@ msgstr "%(plugin_type)s %(plugins)s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
-msgstr "insticksmoduler"
+msgstr "tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
@@ -4686,11 +5205,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
-msgstr "Omvandling"
+msgstr "Konvertera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
-msgstr "Allmän"
+msgstr "Allmänt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
@@ -4698,31 +5217,31 @@ msgstr "Gränssnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
-msgstr "Lägg till/Spara"
+msgstr "Lägg till/spara"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
-"E-post\n"
-"Leverans"
+"E-post-\n"
+"leverans"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
-msgstr "Avancerad"
+msgstr "Avancerat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
-"Media\n"
-"Server"
+"Medie-\n"
+"server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
-msgstr "Insticksmoduler"
+msgstr "Tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Auto send"
@@ -4734,25 +5253,33 @@ msgstr "E-post"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:224
 msgid "Formats to email. The first matching format will be sent."
-msgstr "Formatterar till e-post. Första matchande format kommer att sändas."
+msgstr "Format för e-post. Första matchande format kommer att skickas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
-"Om markerad, kommer hämtade nyheter automatiskt skickas <br> till denna e-"
-"postadress (förutsatt att det är i en av de listade formaten)."
+"Om markerat, kommer hämtade nyheter att skickas automatiskt <br>till denna e-"
+"postadress (förutsatt att de finns i ett av de listade formaten)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
 msgid "new email address"
 msgstr "ny e-postadress"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
-msgid "System port selected"
-msgstr "System port vald"
+msgid "Wide"
+msgstr "Bred"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr "Smal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
+msgid "System port selected"
+msgstr "Systemport vald"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -4762,139 +5289,131 @@ msgstr ""
 "operativsystem kanske inte tillåter att servern lyssnar på denna port. För "
 "att vara på den säkra sidan, välj ett portnummer över 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:509
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1641
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "Fel"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
-msgstr "Misslyckades med att installera kommandoradsverktygen."
+msgstr "Kunde inte installera kommandoradsverktygen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
-msgstr "Kommandoradsverktygen installerade"
+msgstr "Kommandoradsverktygen har installerats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
-msgstr "Kommandoradsverktygen installerade i"
+msgstr "Kommandoradsverktygen har installerats i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
-"Om du flyttar calibre.app, måste du ominstallera kommandoradsverktygen."
+"Om du flyttar calibre.app måste du installera om kommandoradsverktygen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
-msgstr "Ingen giltig sökväg för instickmodulen"
+msgstr "Ingen giltig sökväg till tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
-msgstr "%s är ingen giltig sökväg för instickmodulen"
+msgstr "%s är inte en giltig sökväg till ett tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
-msgstr "Välj instickmodul"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
-msgid "Plugin cannot be disabled"
-msgstr "Instickmodulen kan inte inaktiveras"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
-msgid "The plugin: %s cannot be disabled"
-msgstr "Instickmodulen: %s kan inte inaktiveras"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
-msgid "Plugin not customizable"
-msgstr "Instickmodulen går inte att anpassa"
+msgstr "Välj tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
-msgid "Plugin: %s does not need customization"
-msgstr "Instickmodulen: %s behöver inte anpassas"
+msgid "Plugin cannot be disabled"
+msgstr "Tillägget kan inte inaktiveras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+msgid "The plugin: %s cannot be disabled"
+msgstr "Tillägget: %s kan inte inaktiveras"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
+msgid "Plugin not customizable"
+msgstr "Tillägget går inte att anpassa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
+msgid "Plugin: %s does not need customization"
+msgstr "Tillägget: %s behöver inte anpassas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "Anpassa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
-msgstr "Kan inte ta bort inbyggd instickmodul"
+msgstr "Kan inte ta bort inbyggt tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
-" kan inte tas bort. Det är en inbyggd instickmodul. Försök att inaktivera "
-"den istället."
+" kan inte tas bort. Det är ett inbyggt tillägg. Försök att inaktivera det i "
+"stället."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr "Du måste välja en kolumn för att radera det"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr "Den valda kolumnen är inte en egen kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Vill du verkligen ta bort kolumn %s och alla dess data?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "Fellogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "Åtkomstlogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
-msgstr "Misslyckades med att starta innehållsservern"
+msgstr "Kunde inte starta medieservern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Välj plats för böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
-msgstr "Storleken %s är ogiltig. måste vara av formen bredd x höjd"
+msgstr "Storleken %s är ogiltig. Den måste anges som breddxhöjd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "Ogiltig plats för databas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "Ogiltig plats för databas "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>Måste vara en katalog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ogiltig plats för databas. <br>Kan inte skriva till "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr "Måste starta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4902,28 +5421,29 @@ msgstr ""
 "De ändringar du gjort kräver att calibre att startas om. Vänligen starta om "
 "så snart det är praktiskt möjligt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
-msgstr "Kontrollar databas integritet"
+msgstr "Kontrollerar databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
-msgstr "Misslyckades att kontrolla databas integritet"
+msgstr "Kunde inte kontrollera databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
-msgstr "Några inkonsekvenser funna"
+msgstr "Några inkonsekvenser hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
 "them manually. This can happen if you manipulate the files in the library "
 "folder directly."
 msgstr ""
-"Följande böcker hade format som anges i databasen som inte är tillgängliga. "
-"Posterna för format har tagits bort. Du bör kontrollera dem manuellt. Detta "
-"kan inträffa om du manipulera filerna direkt i biblioteksmappen."
+"Följande böcker var i databasen listade under format som inte är "
+"tillgängliga. Posterna för dessa format har tagits bort. Du bör kontrollera "
+"dem manuellt. Detta kan inträffa om du ändrar på filerna direkt i "
+"biblioteksmappen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
@@ -4935,25 +5455,25 @@ msgid ""
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
-"Här kan du kontrollera hur calibre kommer att läsa metadata från filer som "
-"du lägger till det. calibre kan antingen läsa metadata från innehållet i "
-"filen, eller från filnamnet."
+"Här kan du kontrollera hur Calibre läser metadata från filer du lägger till "
+"i biblioteket. Calibre kan antingen läsa metadata från innehållet i filen "
+"eller från filnamnet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
 msgid "Read metadata only from &file name"
-msgstr "Läs metadata bara från &filnamnet"
+msgstr "Läs metadata endast från &filnamnet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:106
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
 msgstr ""
-"Byt förnamn och efternamn på författaren. Detta påverkar endast metadata "
-"läsa från filnamnen."
+"Byt plats på författarens förnamn och efternamn. Detta påverkar endast "
+"metadata som lästs från filnamnen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
-msgstr "Växla mellan författare förnamn och efternamn"
+msgstr "Byt plats på författarens förnamn och efternamn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:108
 msgid ""
@@ -4966,20 +5486,20 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 "Om en befintlig bok med samma titel och författare finns men inte har det "
-"format som angetts så läggs\n"
-"formatet till befintliga bok, istället för att skapa en ny post. Om de "
-"befintliga boken redan har formatet, så  ignoreras detta utan meddelande.\n"
+"format som angetts så skapas\n"
+"ingen ny post, utan formatet läggs till befintlig bok. Om de befintliga "
+"boken redan finns i detta format, så  ignoreras detta utan meddelande.\n"
 "\n"
-"Titelpassning ignorerar ledande obestämd artikel ( \"ett\", \"en\"), "
-"interpunktion, mål, etc. Författare matchas exakt."
+"För titeln ignoreras inledande obestämda artiklar (\"ett\", \"en\", \"den\", "
+"\"det\"), interpunktion, mål, etc. Författare matchas exakt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:112
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
-"Om böcker med liknande titlar och författare hittats, och sammanfoga de nya "
-"filerna automatiskt"
+"Sammanfoga poster automatiskt om böcker med liknande författare och titel "
+"hittas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
@@ -4994,8 +5514,8 @@ msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
-"Här kan du kontrollera hur calibre sparar dina böcker när du klickar på "
-"\"Spara till disk\" knappen:"
+"Här kan du kontrollera hur Calibre sparar dina böcker när du klickar på "
+"knappen Spara till disk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
@@ -5007,11 +5527,11 @@ msgstr "Uppdatera &metadata i sparade kopior"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
-msgstr "Spara metadata i &OPf fil"
+msgstr "Spara metadata i &OPF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:119
 msgid "Convert non-English characters to &English equivalents"
-msgstr "Konvertera icke-engelska tecken &engelska motsvarigheter"
+msgstr "Konvertera icke-engelska tecken till &engelska motsvarigheter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
@@ -5019,11 +5539,11 @@ msgstr "Formatera &datum som:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
-msgstr "Fil&format för att spara:"
+msgstr "Fil&format att spara som:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
-msgstr "Ersätt mellanslag med _ tecken"
+msgstr "Ersätt mellanslag med understreck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
@@ -5039,299 +5559,312 @@ msgid ""
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
-"Här kan du kontrollera hur calibre sparar dina böcker när du klickar på "
-"\"Skicka till enhet\" knappen. Denna inställning kan har åsidosatts för "
-"individuella enheter genom att anpassa gränssnitten för instickmodulerna i "
-"Inställningar-> Instickmoduler"
+"Här kan du kontrollera hur Calibre sparar dina böcker när du klickar på "
+"knappen Skicka till enhet. Denna inställning kan åsidosättas för "
+"individuella enheter genom att anpassa enhetens gränssnittstillägg i "
+"Inställningar-> Tillägg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
-msgstr "Skickar till enheten"
+msgstr "Skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
-"&Lokalisering av e-böcker (de e-böcker som lagras i mappar sorterade efter "
-"författare och metadata lagras i filen metadata.db)"
+"E-böckernas plats (E-böckerna lagras i mappar sorterade efter författare, "
+"och metadata lagras i filen metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
-msgstr "Bläddra fram till den nya databasen platsen"
+msgstr "Bläddra till den nya databasens plats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
-msgstr "Visa meddelande när &ny version finns tillgänglig"
+msgstr "Visa ett meddelande när en &ny version finns tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
-msgstr "Ladda ner &social metadata (etiketter / omdömen / etc.) Som standard"
+msgstr "Ladda ner &sociala metadata (etiketter/omdömen/etc.) som standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
-msgstr "&Skriv över författare och titel som standard när hämtar metadata"
+msgstr "&Skriv över författare och titel när metadata hämtas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
-msgstr "Grundinställning av &tidbegränsning för nätverk:"
+msgstr "Vänta på nätverkssvar i max"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
-"Ange standard tidbegränsning för nätverkshämtning (dvs. som helst går vi ut "
-"på Internet för att få information)"
+"Ange hur länge programmet ska vänta på information från nätverket (d.v.s. "
+"när information hämtas från Internet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " sekunder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "Välj språk (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "Hög"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "Låg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "Jobb&prioritet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "Önskat &utformat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
-msgstr "Önskat &informatsordning:"
+msgstr "Önskade &informat i ordning:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
-msgstr "Använd &romerska siffror för serienummer"
+msgstr "Använd &romerska siffror för bokens nummer i serien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
-msgstr "Aktivera systemfälts&ikonen (kräver omstart)"
+msgstr "Visa ikon i systemfältet (kräver omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "&Visa meddelanden i systemfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
+msgstr "Visa uppstartsfönster"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+msgid "Show cover &browser in a separate window (needs restart)"
+msgstr "Visa omslags&bläddrare i ett separat fönster (kräver omstart)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
-msgid "Show cover &browser in a separate window (needs restart)"
-msgstr "Visa omslag &bläddrare i ett separat fönster (kräver omstart)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "Sök &medan du skriver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
-msgstr "Automatiskt skicka hämtade &nyheter till e-boksläsare"
+msgstr "Skicka automatiskt hämtade nyheter till läsplattan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
-"Ra&dera nyheter från biblioteket när de skickas automatiskt till läsaren"
+"Ra&dera automatiskt nyheter från biblioteket när de skickats till läsplattan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "A&ntal omslag att visa i bläddringsläget (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "Stor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "Medel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "Liten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "&Bildknappstorlek i verktygsfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "Visa &text på bildknappar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
-msgstr "Välj synliga &kolumnerna i biblioteketsvy"
+msgstr "Välj synliga &kolumnerna i biblioteketsvyn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr "Ta bort ett användardefinierat kolumnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr "Lägg till en användardefinierat kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr "Redigera inställningar för en användardefinierad kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "Använda interna läsare för:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr "Vy (omstart krävs)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "Lägg till en e-postadress som du vill skicka böcker till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "Lägg till e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "Ange som grundinställning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "Ta bort e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
-"Caliber kan skicka böckerna till dig (eller dina läsare) via e-post. E-post "
-"skickas automatiskt för nedladdade nyheter för alla e-postadresser som har "
-"markerats automatskickas."
+"Caliber kan skicka böckerna till dig (eller dina läsare) via e-post. Hämtade "
+"nyheter skickas automatiskt till alla e-postadresser som har markerats."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
-msgstr "&Maximalt antal väntar arbetstagare processer (kräver omstart):"
+msgstr "&Maximalt antal väntande processer (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "&Kontrollera databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "&Installera kommandoradsverktyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
-msgstr "Öppna &calibre inställningsmapp"
+msgstr "Öppna &Calibres inställningsmapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
-msgstr "Begränsa max. samtidiga jobb till lediga &CPU-kärnor"
+msgstr ""
+"Begränsa maximalt antal samtidiga jobb till de tillgängliga &CPU-kärnorna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "Felsök enhets&detektion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
-"calibre innehåller en nätverksserver som ger dig tillgång till din "
-"boksamling med en webbläsare från hela världen. Eventuella ändringar i "
+"Calibre innehåller en nätverksserver så att du kan komma åt ditt bibliotek "
+"var som helst i världen med hjälp av en webbläsare. Eventuella ändringar i "
 "inställningarna träder i kraft först efter en serveromstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "Server&port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Användarnamn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Lösenord:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
-"Om du lämnar lösenordet tomt, kan vem som helst komma åt din boksamling med "
+"Om du lämnar lösenordet tomt, kan vem som helst komma åt ditt bibliotek via "
 "webbgränssnittet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
-"Den maximala storleken (bredd x höjd) för att visas täcker. Större täcker "
-"ändrar storlek. "
+"Den maximala storleken (breddxhöjd) som omslag får visas i. Större omslag "
+"skalas ned. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
-msgstr "Max. omslagsstorlek:"
+msgstr "Största omslagsstorlek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Vi&sa lösenord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
-msgstr "Max. &OPDS poster per fråga:"
+msgstr "Max. &OPDS-poster per fråga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+msgid "Max. OPDS &ungrouped items:"
+msgstr "Max. antal ogr&upperade OPDS-poster"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
-msgstr "&Starta Server"
+msgstr "&Starta servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
-msgstr "St&oppa Server"
+msgstr "St&oppa servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
-msgstr "&Testserver"
+msgstr "&Testa servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
-msgstr "Kör server och &automatiskt vid start"
+msgstr "Starta servern automatiskt när Calibre startas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "Visa &serverloggar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5341,48 +5874,48 @@ msgid ""
 "on your iPhone. Here myhostname should be the fully qualified hostname or "
 "the IP address of the computer calibre is running on."
 msgstr ""
-"<p> Kom ihåg att låta calibre köra eftersom server bara kör så länge calibre "
-"är igång.\n"
-"<p> Stanza borde se din calibre samling automatiskt. Om inte, prova att "
-"lägga till webbadressen http://myhostname:8080 som en ny katalog i Stanza -"
-"läsaren på din iPhone. Här värddatornamn bör vara fullständigt värdnamn "
-"eller IP-adressen för datorn calibre körs på."
+"<p>Kom ihåg att lämna Calibre påslaget, eftersom servern bara kör så länge "
+"Calibre körs.\n"
+"<p>Stanza borde se ditt Calibrebibliotek automatiskt. Om inte, prova att "
+"lägga till webbadressen http://myhostname:8080 som en ny katalog i Stanza-"
+"läsaren på din iPhone. Myhostname bör vara det fullständiga värdnamnet eller "
+"IP-adressen till datorn Calibre körs på."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
-"Här kan du anpassa beteendet hos Calibre genom att kontrollera vilka "
-"instickmoduler den använder."
+"Här kan du anpassa Calibres beteende genom att kontrollera vilka tillägg som "
+"används."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
-msgstr "Aktivera Avaktivera instickmodul"
+msgstr "Aktivera/Inaktivera tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
-msgstr "Anpassa instickmodul"
+msgstr "Anpassa tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
-msgstr "Ta bort instickfil"
+msgstr "Ta bort tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
-msgstr "Lägg till ny instickmodul"
+msgstr "Installera tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
-msgstr "Insticks&fil:"
+msgstr "Tilläggs&fil:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "Lägg till"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
-msgstr "Skapa Etikett-baserade kolumn"
+msgstr "Skapa Etikett-baserad kolumn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
@@ -5413,89 +5946,91 @@ msgid "Number"
 msgstr "Tal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
-msgstr "Bokmärke"
+msgstr "Etikett"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
 msgid "Explanation text added in create_ct_column.py"
-msgstr "Förklaring text läggas till i create_ct_column.py"
+msgstr "Förklaringstext har lagts till i create_ct_column.py"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
 msgid "Create and edit tag-based columns"
-msgstr "Skapa och redigera taggbaserade kolumner"
+msgstr "Skapa och redigera etikettbaserade kolumner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr "Text, kolumn som visas i taggläsaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr "Kommaseparerad text, liknande taggar, som visas i taggläsaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr "Lång texten, liksom kommentarer, som inte framgår av tagläsaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr "Flyttal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr "Heltal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr "Bedömningar som visas med stjärnor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr "Ja/Nej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr "Inga kolumn markerad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr "Ingen kolumn har valts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr "Markerade kolumn är inte en användardefinierad kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr "Inga söknamn lämnades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
-"Etiketten får endast innehålla bokstäver och siffror, och börja med en "
-"bokstav"
+"Kolumnetiketten får bara innehålla bokstäver, siffror och understreck, och "
+"måste börja med en bokstav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr "Ingen kolumnrubrik lämnades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr "Den söknamnet %s används redan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr "Rubriken %s används redan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5570,7 +6105,7 @@ msgstr "Hämtar felsökningsinformation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
-msgstr "&Kopiera till Urklipp"
+msgstr "&Kopiera till urklipp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
@@ -5596,10 +6131,10 @@ msgid ""
 "particular book does not have some metadata, the variable will be replaced "
 "by the empty string."
 msgstr ""
-"Genom att justera mallen nedan kan du styra vilka mappar filerna sparas i "
-"och vilka filnamn de ges. Du kan använda / tecken för att visa undermappar. "
-"Tillgängliga metadata variabler beskrivs nedan. Om en viss bok inte har "
-"några metadata, kommer variabeln ersätts med en tom sträng."
+"Genom att redigera mallen nedan kan du kontrollera i vilka mappar filer "
+"sparas och vilka namn de får. Använd / för att ange undermappar. "
+"Tillgängliga variabler för metadata ses nedan. Om en viss bok saknar "
+"metadata kommer variabeln att ersättas med en tom sträng."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
@@ -5607,7 +6142,7 @@ msgstr "Tillgängliga variabler:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
-msgstr "Nedladdning social metadata, vänligen vänta..."
+msgstr "Hämtar sociala metadata..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
@@ -5617,6 +6152,27 @@ msgstr "Visa denna varning igen"
 msgid "ERROR"
 msgstr "FEL"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Författarsortering"
@@ -5635,7 +6191,7 @@ msgstr "Kunde inte hitta metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:180
 msgid "The metadata download seems to have stalled. Try again later."
-msgstr "Metadata hämtning tycks ha avstannat. Försök igen senare."
+msgstr "Metadatahämtningen har verkar ha stannat. Försök igen senare."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
@@ -5647,17 +6203,17 @@ msgstr "Kunde inte hämta metadata från:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
-msgstr "Ingen metadata funnen"
+msgstr "Ingen metadata hittades"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:195
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
-"Ingen metadata funnen. Försök ändra titel och författare eller ISBN numret."
+"Ingen metadata hittades. Försök ändra titel och författare eller ISBN-numret."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
-msgstr "Hämtar metadata"
+msgstr "Hämta metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
 msgid ""
@@ -5666,10 +6222,10 @@ msgid ""
 "<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
 "below."
 msgstr ""
-"<p> calibre kan hitta metadata om dina böcker från två platser: <b> Google "
-"Books </b> och <b> isbndb.com </b>. <p> vill använda isbndb.com måste du "
-"registrera dig för ett <a href=\"http://www.isbndb.com\"> gratis konto </a> "
-"och skriva in din behörighetskod nedan."
+"<p>Calibre kan söka efter metadata om dina böcker från två platser: "
+"<b>Google Books</b> och <b>isbndb.com</b>. <p> För att använda isbndb.com "
+"måste du registrera dig för ett <a href=\"http://www.isbndb.com\"> gratis "
+"konto</a> och ange din behörighetskod nedan."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
@@ -5686,15 +6242,18 @@ msgstr "Träffar"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
 msgid ""
 "Select the book that most closely matches your copy from the list below"
-msgstr "Välj den bok som bäst passar din kopia från listan nedan"
+msgstr "Välj den bok som bäst passar ditt exemplar från listan nedan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
 msgid "Download &social metadata (tags/rating/etc.) for the selected book"
-msgstr "Ladda ner &social metadata (tags / betyg / etc.) För den valda boken"
+msgstr ""
+"Ladda ner &sociala metadata (etiketter/betyg/etc.) för den valda boken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
 msgid "Overwrite author and title with author and title of selected book"
-msgstr "Skriv överförfattare och titel med författare och titel utvalda bok"
+msgstr ""
+"Skriv över befintlig författare och titel med författare och titel för den "
+"valda boken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
@@ -5726,11 +6285,11 @@ msgstr "Redigera metainformation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
-msgstr "A&utomatiskt  ange författaresortering"
+msgstr "Ställ in författarsortering a&utomatiskt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
-msgstr "Författares&ortering "
+msgstr "Författars&ortering "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
@@ -5738,8 +6297,8 @@ msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
-"Ange hur författaren (er) av denna bok ska sorteras. Till exempel Charles "
-"Dickens ska sorteras som Dickens, Charles."
+"Ange hur författaren till denna bok ska sorteras. Exempel: Charles Dickens "
+"ska sorteras som Dickens, Charles."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
@@ -5764,22 +6323,22 @@ msgstr " stjärnor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
-msgstr "Lägg till ta&ggar: "
+msgstr "Lägg till etiketter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
 msgid "Open Tag Editor"
-msgstr "Öppna taggredigering"
+msgstr "Öppna etikettredigeraren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
-msgstr "Ta bo&rt taggar:"
+msgstr "Ta bo&rt etiketter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
-msgstr "Kommaseparerad lista med taggar för att ta bort från böckerna. "
+msgstr "Kommaseparerad lista med etiketter att ta bort från böckerna. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
@@ -5787,7 +6346,7 @@ msgstr "Ta bort &format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
-msgstr "Växla mellan titel och författare"
+msgstr "Byt plats på titel och författare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
 msgid ""
@@ -5796,14 +6355,14 @@ msgid ""
 "So if you selected Book A and then Book B,\n"
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
-"Valda böcker kommer att numreras automatiskt,\n"
-"i den ordning du valt dem.\n"
-"Så om du valt Boka A och sedan Bok B,\n"
-"Boka A kommer att få serienummer 1 och Bok B- erien nummer 2."
+"Böckerna som väljs numreras automatiskt,\n"
+"i den ordning de valts.\n"
+"Så om Bok A valts först och sedan Bok B,\n"
+"kommer Boka A att få nummer 1 i serien och Bok B nummer 2."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
-msgstr "Automatiskt numrera böcker i serien"
+msgstr "Numrera automatiskt böcker i serien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
 msgid ""
@@ -5838,18 +6397,13 @@ msgstr "Inte en giltig bild"
 msgid "Choose formats for "
 msgstr "Välj format för "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
-msgid "Books"
-msgstr "Böcker"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
-msgstr "Ingen behörighet"
+msgstr "Ej behörig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:168
 msgid "You do not have permission to read the following files:"
-msgstr "Du har inte behörighet att läsa följande filer:"
+msgstr "Du är ej behörig att läsa följande filer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
@@ -5862,7 +6416,7 @@ msgstr "Kunde inte läsa metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:208
 msgid "Could not read metadata from %s format"
-msgstr "Kunde inte läsa metadata från %s format"
+msgstr "Kunde inte läsa metadata från %s-format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:256
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
@@ -5871,79 +6425,87 @@ msgstr "Kunde inte läsa omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:257
 msgid "Could not read cover from %s format"
-msgstr "Kunde inte läsa omslag från %s format"
+msgstr "Kunde inte läsa omslag från %s-format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
 msgid "The cover in the %s format is invalid"
-msgstr "Omslaget i %s format är ogiltigt"
+msgstr "Omslaget i %s-format är ogiltigt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
 msgid "Abort the editing of all remaining books"
 msgstr "Avbryt redigering av alla kvarvarande böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "Detta ISBN-nummer är giltigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "Denna ISBN-nummer är ogiltigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr "Kan ej använda etikettredigeraren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr "Etikettredigerar kan inte användas om du har ändrat etiketterna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "Hämtar omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "Kan inte hämta omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Kunde inte hämta omslag.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "Hämtningen avbröts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "Kunde inte hitta omslag för denna bok. Försök ange ISBN först."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "Dåligt omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "Omslaget är inte en giltig bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
-msgstr "Där fanns fel"
+msgstr "Fel inträffade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
-msgstr "Där fanns fel vid hämtningen av social metadata"
+msgstr "Fel inträffade vid hämtning av sociala metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "Kunde inte hämta metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "Du måste ange minst en av ISBN, titel, författare eller förlag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "Åtkomst nekad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
-msgstr "Kunde inte öppna %s. Kanske det används av ett annat program?"
+msgstr "Kunde inte öppna %s. Kanske används det av ett annat program?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Edit Meta Information"
@@ -5955,7 +6517,7 @@ msgstr "Metainformation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
-msgstr "Byt författare och titel"
+msgstr "Byt plats på författare och titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 msgid "Author S&ort: "
@@ -5964,9 +6526,7 @@ msgstr "Författars&ortering: "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
-msgstr ""
-"Skapa automatiskt posten sortera författare baserat på nuvarande "
-"författareposten"
+msgstr "Gissa hur författaren skall sorteras utifrån dess namn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "Remove unused series (Series that have no books)"
@@ -5978,7 +6538,7 @@ msgstr "IS&BN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
 msgid "Publishe&d:"
-msgstr "Förlag&d:"
+msgstr "Publicera&d:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "dd MMM yyyy"
@@ -6006,11 +6566,11 @@ msgstr "Lägg till ett nytt format för den här boken till databasen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
 msgid "Remove the selected formats for this book from the database."
-msgstr "Ta bort det valda formatet för den här boken från databasen."
+msgstr "Ta bort valt format av den här boken från databasen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Set the cover for the book from the selected format"
-msgstr "Ange omslag för boken från det valda formatet"
+msgstr "Använd valt format för att skapa bokomslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
 msgid "Update metadata from the metadata in the selected format"
@@ -6036,34 +6596,36 @@ msgstr "Avbryter..."
 msgid ""
 "The current saved search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"Den aktuella sparade sökningen kommer att </b>raderas permanent</b>. Vill du "
+"fortsätta?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
 msgid "Saved Search Editor"
-msgstr ""
+msgstr "Redigera sparade sökningar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
 msgid "Saved Search: "
-msgstr ""
+msgstr "Sparad sökning "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
 msgid "Select a saved search to edit"
-msgstr ""
+msgstr "Välj en sparad sökning att redigera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
 msgid "Delete this selected saved search"
-msgstr ""
+msgstr "Ta bort vald sparad sökning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
 msgid "Enter a new saved search name."
-msgstr ""
+msgstr "Ange nytt namn på sparad sökning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
 msgid "Add the new saved search"
-msgstr ""
+msgstr "Lägg till den nya sparade sökningen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
 msgid "Change the contents of the saved search"
-msgstr ""
+msgstr "Ändra innehållet i den sparade sökningen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
@@ -6072,7 +6634,7 @@ msgstr "Behöver användarnamn och lösenord"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
 msgid "You must provide a username and/or password to use this news source."
 msgstr ""
-"Du måste ange ett användarnamn och / eller lösenord för att använda denna "
+"Du måste ange ett användarnamn och/eller lösenord för att använda denna "
 "nyhetskälla."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
@@ -6085,7 +6647,7 @@ msgstr "Senast hämtad: aldrig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
 msgid "%d days, %d hours and %d minutes ago"
-msgstr "%d dagar, %d timmar och %d minuter sedan"
+msgstr "För %d dagar, %d timmar och %d minuter sedan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
@@ -6102,15 +6664,15 @@ msgstr "Lägg till en anpassad nyhetskälla"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
 msgid "Download all scheduled new sources"
-msgstr "Ladda ner alla planerade nya källor"
+msgstr "Hämta nyheter från alla planerade nya källor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
-msgstr "Ingen internetanslutning"
+msgstr "Ingen Internetanslutning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
-msgstr "Kan inte hämta nyheter eftersom ingen Internet-anslutning är aktiv"
+msgstr "Kan inte hämta nyheter eftersom ingen Internetanslutning är aktiv"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
@@ -6136,7 +6698,7 @@ msgstr "&Schemalägg för hämtning:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
 msgid "Every "
-msgstr "Var "
+msgstr "Varje "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
@@ -6172,7 +6734,7 @@ msgstr "söndag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
-msgstr "vid"
+msgstr "klockan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209
 msgid ""
@@ -6194,7 +6756,7 @@ msgstr "Konto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
-msgstr "För schemaläggning ska fungera måste du lämna calibre igång."
+msgstr "För att schemaläggning ska fungera måste du lämna Calibre igång."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
@@ -6202,15 +6764,15 @@ msgstr "&Schemalägg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
-msgstr "Lägg till &titel som tagg"
+msgstr "Lägg till &titel som etikett"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
-msgstr "&Extra  taggar:"
+msgstr "&Extra etiketter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
-msgstr "&Avancerad"
+msgstr "&Avancerat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
@@ -6234,15 +6796,15 @@ msgstr "innehåller"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
 msgid "The text to search for. It is interpreted as a regular expression."
-msgstr "Den text som ska söka efter. Det tolkas som ett reguljärt uttryck."
+msgstr "Den text som ska sökas efter. Det tolkas som ett reguljärt uttryck."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
 msgid ""
 "<p>Negate this match. That is, only return results that <b>do not</b> match "
 "this query."
 msgstr ""
-"<p> Negera denna matchning. Det vill säga returnera bara resultat som <b> "
-"inte </b> passar denna fråga."
+"<p>Negera denna matchning. Det vill säga returnera bara resultat som "
+"<b>inte</b> matchar denna fråga."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
@@ -6254,7 +6816,7 @@ msgstr "Avancerad sökning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
-msgstr "Hitta inlägg som ..."
+msgstr "Hitta poster som ..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
@@ -6262,7 +6824,7 @@ msgstr "&Alla dessa ord:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
-msgstr "Denna exakt fras:"
+msgstr "Exakt denna fras:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
@@ -6274,25 +6836,24 @@ msgstr "Men visa inte poster som har ..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
-msgstr "Något av dessa och oönskade ord:"
+msgstr "Något av dessa oönskade ord:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
-msgstr "Vilken typ av jämförelse att använda:"
+msgstr "Vilket slags matchning skall användas:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121
 msgid "Contains: the word or phrase matches anywhere in the metadata"
-msgstr "Innehåller: ordet eller frasen matcher någonstans i metadatat"
+msgstr "Innehåller: ordet eller frasen matcher någonstans i metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:122
 msgid "Equals: the word or phrase must match an entire metadata field"
-msgstr ""
-"Betydelse: det ord eller fras som måste jämföras ett helt metadatafält"
+msgstr "Betydelse: ordet eller frasen som måste matcha ett helt metadatafält"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123
 msgid ""
 "Regular expression: the expression must match anywhere in the metadata"
-msgstr "Reguljärt uttryck: uttrycket måste passa någonstans i metadata"
+msgstr "Reguljärt uttryck: uttrycket måste passa in någonstans i metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
@@ -6304,19 +6865,19 @@ msgid ""
 "interface\">User Manual</a> for more help"
 msgstr ""
 "Se <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
-"interface\"> Bruksanvisning </a> för mer hjälp"
+"interface\">Bruksanvisningen</a> för mer hjälp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr "Välj format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "Författare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "Utgivare"
 
@@ -6333,7 +6894,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
 msgid "User Categories Editor"
-msgstr ""
+msgstr "Redigera användarkategorier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -6389,112 +6950,115 @@ msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
 msgstr ""
-"Följande taggar används av en eller flera böcker. Är du säker på att du vill "
-"ta bort dem?"
+"Följande etiketter används av en eller flera böcker. Är du säker på att du "
+"vill ta bort dem?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
-msgstr "Taggredigerare"
+msgstr "Etikettredigerare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
-msgstr "Tillgängliga etikett"
+msgstr "Tillgängliga etiketter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
 msgid ""
 "Delete tag from database. This will unapply the tag from all books and then "
 "remove it from the database."
 msgstr ""
-"Ta bort taggen från databasen. Detta kommer ta bort taggen från alla böcker "
-"och sedan ta bort den från databasen."
+"Ta bort etiketten från databasen. Detta kommer ta bort etiketten från alla "
+"böcker och sedan ta bort den från databasen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
-msgstr "Sätt tag på aktuell bok"
+msgstr "Sätt etikett på aktuell bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
-msgstr "Tilläm&pa etiketter"
+msgstr "Nuvarande etiketter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
-msgstr "Ta bort tag från aktuell bok"
+msgstr "Ta bort etikett från aktuell bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
-msgstr "Lägg till tagg:"
+msgstr "Lägg till etikett:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
 msgid ""
 "If the tag you want is not in the available list, you can add it here. "
 "Accepts a comma separated list of tags."
 msgstr ""
-"Om taggen du vill använda inte finns på listan, kan du lägga till den här. "
-"Accepterar en kommaseparerad lista med taggar."
+"Om etiketten du vill använda inte finns på listan, kan du lägga till den "
+"här. Accepterar en kommaseparerad lista med etiketter."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
 msgid "Add tag to available tags and apply it to current book"
-msgstr "Lägg tag till tillgängliga etiketter och tillämpa den på aktuell bok"
+msgstr ""
+"Lägg till etiketten i tillgängliga etiketter och tillämpa den på aktuell bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
-msgstr ""
+msgstr "Posten är tom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
-msgstr ""
+msgstr "En post kan inte lämnas tom. Ta bort den i stället."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
 msgid "Item already used"
-msgstr ""
+msgstr "Posten används redan."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
 msgid "The item %s is already used."
-msgstr ""
+msgstr "Posten %s används redan."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
 msgid "No item selected"
-msgstr ""
+msgstr "Ingen post vald"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
 msgid "You must select one item from the list of Available items."
-msgstr ""
+msgstr "Du måste välja en post från listan Tillgängliga poster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
 msgid "No items selected"
-msgstr ""
+msgstr "Inga poster valda"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
 msgid "You must select at least one items from the list."
-msgstr ""
+msgstr "Du måste välja minst en post ur listan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
 msgid "Are you certain you want to delete the following items?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
-msgid "Category Editor"
-msgstr ""
+msgstr "Är du söker på att du vill ta bort följande poster?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
-msgid "Items in use"
-msgstr ""
+msgid "Category Editor"
+msgstr "Kategoriredigerare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr "Poster som används"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
+"Ta bort post från databasen. Detta kommer att ta bort posten från alla "
+"böcker och sedan ta bort den från databasen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
-msgstr ""
+msgstr "Byt namn på posten i alla böcker den används"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
-msgstr ""
+msgstr "Ctrl+S"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
@@ -6515,7 +7079,7 @@ msgstr "Inget recept valt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
-msgstr "Den bifogade filen: %s är ett recept att hämta %s."
+msgstr "Den bifogade filen: %s är ett recept för att hämta %s."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
@@ -6525,28 +7089,28 @@ msgstr "Recept för "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
 msgid "Switch to Advanced mode"
-msgstr "Växla till avancerad inställning"
+msgstr "Växla till avancerat läge"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 msgid "Switch to Basic mode"
-msgstr "Växla till grundläggande inställning"
+msgstr "Växla till grundläge"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
-msgstr "Flöde måste ha en titel"
+msgstr "RSS-flödet måste ha en titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
-msgstr "Flödet måste ha en titel"
+msgstr "RSS-flödet måste ha en titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
-msgstr "Flöde måste ha en URL"
+msgstr "RSS-flödet måste ha en URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
-msgstr "Flödet %s  måste ha en URL"
+msgstr "RSS-flödet %s måste ha en URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
@@ -6560,13 +7124,13 @@ msgstr "Detta flöde har redan lagts till receptet"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:286
 msgid "Invalid input"
-msgstr "Felaktigt indata"
+msgstr "Felaktiga indata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:287
 msgid "<p>Could not create recipe. Error:<br>%s"
-msgstr "<p> Kunde inte skapa recept. Fel: <br>%s"
+msgstr "<p>Kunde inte skapa recept. Fel:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:241
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:263
@@ -6586,7 +7150,7 @@ msgstr "Välj recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
-msgstr "Välj recept för anpassning"
+msgstr "Välj ett recept att anpassa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
@@ -6640,9 +7204,9 @@ msgstr ""
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"> Skapa ett grundläggande "
-"nyhetsrecept, genom att lägga till RSS-flöden för det. <br /> För de flesta "
-"typer av flöden, måste du använda \"Avancerat läge\" för att ytterligare "
-"anpassa hämtprocessen. </p> </body> </html>"
+"nyhetsrecept, genom att lägga till RSS-flöden för det.<br />För de flesta "
+"typer av flöden, måste du använda \"avancerat läge\" för att ytterligare "
+"anpassa hämtningsprocessen.</p> </body> </html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
@@ -6666,7 +7230,7 @@ msgstr "Maximalt antal artiklar att ladda ner per flöde."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
-msgstr "Flöde i recept"
+msgstr "Flöden i receptet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
@@ -6683,7 +7247,7 @@ msgstr "&Flödestitel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
-msgstr "Flödes&URL"
+msgstr "Flödes-&URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
@@ -6695,8 +7259,8 @@ msgid ""
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
 msgstr ""
 "För hjälp med att skriva avancerade nyhetsrecept besök <a "
-"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\"> User Recept "
-"</a>"
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">Användarrecept</"
+"a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
@@ -6733,19 +7297,18 @@ msgstr ""
 "</style> </head> <body style=\" font-family:'Candara'; font-size:10pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"> Ange ett reguljärt "
-"uttrycksmönster att använda när man försöker gissa e-boks metadata från "
-"filnamn. </p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Ange ett reguljärt "
+"uttrycksmönster att för att gissa e-bokens metadata från filnamnet.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"> A <a href = "
+"right:0px; -qt-block-indent:0; text-indent:0px;\"> En <a href = "
 "\"http://docs.python.org/lib/re-syntax.html\"> <span style=\" text-"
 "decoration: underline; color:#0000ff;\"> referens </ span> </a > på syntax "
 "för reguljära uttryck finns. </p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"> Använd <span style = "
-"\"font-weight: 600;\"> Test </ span> funktionaliten nedan för att testa ditt "
-"vanliga uttryck på ett par exempel på filnamn. Gruppnamnen för de olika "
-"metadata poster dokumenteras i verktygstips. </p> </body> </html>"
+"\"font-weight: 600;\"> Testa </ span> funktionaliten nedan för att testa "
+"ditt reguljära uttryck på ett par exempelfilnamn. Gruppnamnen för de olika "
+"metadataposterna dokumenteras i verktygstips. </p> </body> </html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
@@ -6761,18 +7324,18 @@ msgstr "Titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
-msgstr "Reguljära uttryck (?P&lt;title&gt;)"
+msgstr "Reguljärt uttryck (?P&lt;title&gt;)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "Ingen träff"
 
@@ -6782,23 +7345,23 @@ msgstr "Författare:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
-msgstr "Reguljära uttryck (?P<author>)"
+msgstr "Reguljärt uttryck (?P<author>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
-msgstr "Serier:"
+msgstr "Serie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
-msgstr "Reguljära uttryck (?P<series>)"
+msgstr "Reguljärt uttryck (?P<series>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
-msgstr "Indexserier:"
+msgstr "Ordningsnummer i serien:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
-msgstr "Reguljära uttryck (?P<series_index>)"
+msgstr "Reguljärt uttryck (?P<series_index>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
@@ -6806,58 +7369,211 @@ msgstr "ISBN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
-msgstr "Reguljära uttryck (?P<isbn>)"
+msgstr "Reguljärt uttryck (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Spara ett enstaka format till disk ..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "Redigera metadata individuellt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "Redigera metadata i grupp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "Hämta metadata och omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "Hämta bara metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "Hämta bara omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "Hämta bara sociala metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "Slå samman till den första valda boken - radera övriga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "Slå samman till den första valda boken - behåll övriga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "Lägg till böcker från en enda katalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+"Lägg till böcker från kataloger, inklusive underkataloger (en bok per "
+"katalog, antar att varje e-bokfil är samma bok i ett annat format)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Lägg till böcker från kataloger, inklusive underkataloger (flera böcker per "
+"katalog, antar att varje e-bokfil en ny bok)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Lägg till tom bok (bokpost utan format)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Spara till disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "Spara till disk i en enda katalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "Spara bara %s-format på disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr "Spara bara %s format till disk i en enda katalog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "Visa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "Visa specifikt format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "Ta bort valda böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "Ta bort filer av specifikt format från valda böcker."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "Ta bort alla format från utvalda böcker, utom ..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "Ta bort omslag från valda böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "Konvertera individuellt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "Masskonvertering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "Skapa en bokkatalog i ditt Calibre biblioteket"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "Kör välkomstguide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "Liknande böcker..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr "Omslagsbläddrare"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr "Etikettbläddrare"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr "Bokinformation"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "Förlopp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "Körtid"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
-msgstr "Det finns %d jobb som kör"
+msgstr "%d jobb som körs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Okänt jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
-msgstr "Det finns %d jobb som väntar"
+msgstr "%d jobb väntar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Kan inte avsluta jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Kan inte avsluta jobb som kommunicerar med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
-msgstr "Jobb har redan körts"
+msgstr "Jobbet har redan körts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
-msgstr "Otillgänglig"
+msgstr "Otillgängligt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Jobb:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Klicka för att se listan över aktiva jobb."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
-msgstr " -Jobb"
+msgstr " - Jobb"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
@@ -6867,117 +7583,96 @@ msgstr "N"
 msgid "Y"
 msgstr "J"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr "På enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
-msgstr "Storlek (MB)"
+msgstr "MiB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "Betyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:284
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1000
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "Ingen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Bok <font face=\"serif\">%s</font> av %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:638
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr "Söknamn är \"(0)\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr "Storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr "Samlingar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr "Markerat för borttagning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "Dubbelklicka <b> redigera </b> me <br> <br>"
+msgstr "Dubbelklicka för att <b>redigera</b> mig<br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr "Dölj kolumn %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr "Sortera på %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr "Stigande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr "Fallande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr "Ändra textjustering för %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr "Vänster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr "till höger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr "Centrera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr "Visa kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr "Återställ standardutformning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
-msgstr "Inte tillåten"
+msgstr "Tillåẗs ej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
-"Släppa på en enhet stöds inte. Först lägga till boken i calibre biblioteket."
+"Drag-och-släpp till en enhet stöds inte. Lägg först till boken i Calibre-"
+"biblioteket."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
@@ -6993,15 +7688,15 @@ msgstr "Avstava"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
 msgid "<b>Changes will only take effect after a restart.</b>"
-msgstr "<b> Förändringar träder i kraft först efter en omstart. </b>"
+msgstr "<b>Förändringar träder i kraft först efter omstart.</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
-msgstr " - LRF visare"
+msgstr " - LRF-visare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
-msgstr "<b> Inga träffar</b> för sökfrasen <i>%s </i> hittades."
+msgstr "<b>Inga träffar</b> för sökfrasen <i>%s</i> hittades."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:440
@@ -7010,7 +7705,7 @@ msgstr "Inga träffar hittades"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
-msgstr "LRF visare"
+msgstr "LRF-visare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
@@ -7018,7 +7713,7 @@ msgstr "Tolkar LRF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
-msgstr "LRF visare verktygsrad"
+msgstr "LRF-visarens verktygsrad"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:476
@@ -7059,7 +7754,7 @@ msgstr "Använd biblioteket som ligger på den angivna sökvägen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
-msgstr "Start minimerad till aktivitetsfältet."
+msgstr "Starta minimerad till systemfältet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
@@ -7069,290 +7764,261 @@ msgstr "Logga felsökningsinformation till konsol"
 msgid "Do not check for updates"
 msgstr "Sök inte efter uppdateringar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr "Välj en plats för ditt calibre e-bokbibliotekt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr "Misslyckades skapa katalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "Misslyckades skapa calibre katalog i: %r. Avslutar."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr "Lagning misslyckades"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr "Lagning av databas misslyckades. Börjar med en ny tom (katalog)."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
-msgstr "Calibre bibliotek"
+msgstr "Calibre-bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr "Välj en plats för Calibres e-bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr "Kunde inte skapa bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr "Kunde inte skapa ett Calibre-bibliotek i %r."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
-msgstr "Välj en plats för din nya calibre e-bokbibliotek"
+msgstr "Välj en plats för Calibres nya e-bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr "Startar anvåndargränssnitt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr "Kunde inte reparera"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr "Databasen kunde inte repareras. Börjar med ett nytt, tomt bibliotek."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "Dålig databasplats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
-msgstr "Felaktig databasplats %r. calibre kommer nu avslutas."
+msgstr "Felaktig databasplats %r. Calibre kommer nu att avslutas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "Skadad databas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
-"Din calibre-databas verkar vara skadad. Vill du att calibre ska försöka "
-"reparera den automatiskt? Om du säger nej, kommer ett nytt calibre-bibliotek "
+"Din Calibre-databas verkar vara skadad. Vill du att Calibre ska försöka "
+"reparera den automatiskt? Om du säger nej, kommer ett nytt Calibre-bibliotek "
 "att skapas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr "Reparerar databas. Detta kan ta mycket lång tid för en stor samling"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
-"Felaktig databasplats %r. Kommer börja med ett nytt, tomt calible-bibliotek"
+"Felaktig databasplats %r. Kommer börja med ett nytt, tomt Calibre-bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
-msgstr ""
+msgstr "Startar %s: Laddar böcker..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
-msgstr "Om du är säker på att det inte kör"
+msgstr "Om du är säker på att det inte körs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "Kan inte starta "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
-msgstr "%s kör redan."
+msgstr "%s körs redan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
-msgstr "kan köras i systemfältet i"
+msgstr "kan köras i systemfältet i det"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "övre högra området på skärmen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "nedre högra området på skärmen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
-msgstr "försök starta om datorn."
+msgstr "försök att starta om datorn."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
-msgstr "försök ta bort filen"
+msgstr "försök att ta bort filen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
-msgstr "calibre"
+msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr "&Begränsa till:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 "Bokskärmen kommer att begränsas till de som passar den valda sparade "
 "sökningen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
-msgstr "Ställ in ui.py"
+msgstr "Ställ in i ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "Avancerad sökning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "&Sök:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
-"<p> sök i listan med böcker efter titel, författare, förlag, taggar, "
-"kommentarer, m.m. <br> <br> Ord separerade med mellanslag OCHade"
+"<p>Sök i listan med böcker efter titel, författare, förlag, taggar, "
+"kommentarer, m.m. <br><br>Ord separerade med mellanslag får relationen OCH"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "Återställ snabbsökning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
-msgstr "Välj sparad sökning eller ange namn för nya sparade sökningen"
+msgstr "Välj sparad sökning eller ange namn för en ny sparad sökning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
-msgstr "Kopiera aktuell sökningtext (i stället för söknamn)"
+msgstr "Kopiera aktuell söktext (i stället för söknamn)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
-msgstr "Spara aktuell sökning under namnet visas i rutan"
+msgstr "Spara aktuell sökning under namnet som visas i rutan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "Radera aktuell sparad sökning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-msgid "Sort by &popularity"
-msgstr "Sortera enligt &populäritet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
-msgid "Match any"
-msgstr "Passa någon"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
-msgid "Match all"
-msgstr "Passa alla"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Create, edit, and delete user categories"
-msgstr "Skapa, redigera och ta bort användarkategorier"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Manage &user categories"
-msgstr "Hantera &användarekategorier"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Lägg till böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Ta bort böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "Redigera metainformation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr "Sammanfoga bokuppgifter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "Skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Spara på disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "Hämta nyheter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
-msgstr "Omvandlar e-böcker"
+msgstr "Konvertera e-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "Visa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
-msgstr "Öppna mappen som innehåller"
+msgstr "Öppna mapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "Visa bokdetaljer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "Böcker med samma författare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "Böcker i denna serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "Böcker av den här utgivaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
-msgstr "Böcker med samma tagg"
+msgstr "Böcker med samma etikett"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
-msgstr "Anpassa calibre"
+msgstr "Anpassa Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -7361,8 +8027,8 @@ msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
 "on windows where GUI apps do not have a output streams."
 msgstr ""
-"Omdirigera konsol utdata till en dialogruta (både stdout och stderr). "
-"Användbar på fönstren där GUI apps inte har en utström"
+"Omdirigera utdata från konsolen till en dialogruta (både stdout och stderr). "
+"Används på fönster där grafiska applikationer saknar utström"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
@@ -7384,23 +8050,43 @@ msgstr "Boken har varken titel eller ISBN"
 msgid "No matches found for this book"
 msgstr "Inga träffar hittades för den här boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "Sök"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "Den valda sökningen kommer att <b> tas bort permanent </b>. Är du säker?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Sök (för avancerad sökning, klicka på knappen till vänster)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "Sparade sökningar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr "({0} av {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "(alla böcker)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr "({0} av alla)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
-msgstr "Tryck på en knapp ..."
+msgstr "Tryck på valfri knapp..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
-msgstr "Redan tilldelats"
+msgstr "Redan tilldelad"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
@@ -7454,88 +8140,81 @@ msgstr "Rensa"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativ snabbtangent:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "Jobb:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "Klicka för att se listan över aktiva jobb."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr "Dölj bokdetaljer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr "Visa bokdetaljer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr "Dölj tagläsare"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr "Visa tagläsare"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr "Visa omslagsläsare"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr "Omslagsläsaren kunde inte laddas: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:148
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
-msgstr ""
+msgstr "Dölj kategori %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
-msgstr ""
+msgstr "Visa kategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
+msgstr "Visa alla kategorier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:167
-msgid "Manage "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
-msgstr ""
+msgstr "Hantera sparade sökningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
-msgstr ""
+msgstr "Hantera användarkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "Sökningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr "Kopiera sökningens namn"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr "Namnet %s för den sparade sökningen används redan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "Matcha alla"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "Matcha någon"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr "Hantera &användarkategorier"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
-msgstr "Konvertera bok %d of %d (%s)"
+msgstr "Konvertera bok %d av %d (%s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
@@ -7572,664 +8251,116 @@ msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
 msgstr ""
-"Följande böcker har redan omvandlats till %s-format. Vill du omvandla dem?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "Spara enda format till disk ..."
+"Följande böcker har redan konverterats till %s-format. Vill du konvertera "
+"dem en gång till?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "Sök (Avancerad Sökning klicka på knappen till vänster)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "Sparade sökningar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "Fel vid kommunikation med enheten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "Åte&rställ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "&Donera för att stödja Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
-msgstr "Mata ansluten &enhet"
+msgstr "Mata ut ansluten &enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "Omsta&rt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p> För hjälp se: <a href=\"%s\"> Användarhandbok </a> <br>"
+msgstr "<p>För hjälp se: <a href=\"%s\">Användarhandbok</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
-"<b>%s </b>: %s av <b> Kovid Goyal %%(version)s </b> <br>%%(device)s </p>"
+"<b>%s</b>: %s av <b> Kovid Goyal %%(version)s </b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "Redigera metadata individuellt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "Redigera metadata i grupp"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "Hämta metadata och omslag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "Hämta bara metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "Hämta bara omslag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "Hämta bara social metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "Slå samman till första valda boken - radera andra"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "Slås samman till första valda boken - behålla andra"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "Lägg till böcker från en enda katalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-"Lägg till böcker från kataloger, inklusive underkataloger (en bok per "
-"katalog, antar attvarje e-bok filen är samma bok i ett annat format)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-"Lägg till böcker från kataloger, inklusive underkataloger (Flera böcker per "
-"katalog, antar att varje e-bok-fil är en annan bok)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Lägg till tom bok. (Bokpost utan format)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "Spara till disk i en enda katalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2290
-msgid "Save only %s format to disk"
-msgstr "Spara bara %s-format på disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2293
-msgid "Save only %s format to disk in a single directory"
-msgstr "Spara bara %s format till disk i en enda katalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "Visa specifikt format"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "Ta bort valda böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "Ta bort filer av specifikt format från valda böcker."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "Ta bort alla format från utvalda böcker, utom ..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "Ta bort omslag från valda böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "Omvandla individuellt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "Massomvandling"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "Skapa sortiment av böcker i ditt calibre biblioteket"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "Kör välkomstguide"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "Liknande böcker..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
-msgstr "Calibre snabbstartsguide"
+msgstr "Calibres snabbstartsguide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
-msgid "Select folder to open as device"
-msgstr "Välj mapp för att öppnas som enhet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
-msgid "Browse by covers"
-msgstr "Bläddra bland omslag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
-msgid "({0} of {1})"
-msgstr "({0} av {1})"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
-msgid "(all books)"
-msgstr "(Alla böcker)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
-msgid "({0} of all)"
-msgstr "({0} av alla)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
-msgid "Device: "
-msgstr "Enhet: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
-msgid " detected."
-msgstr " funnen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
-msgid "Connected "
-msgstr "Ansluten "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
-msgid "Device database corrupted"
-msgstr "Enhetsdatabas skadad"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p> bokdatabas på läsaren är skadad. Prova följande:\n"
-"                <ol>\n"
-"                <li> Koppla ur läsaren. Vänta på att den slutför "
-"regenerering av databasen (dvs. vänta tills den är klar att användas). "
-"Koppla in den igen i. Nu är det bör fungera med %(app)s. Om inte prova med "
-"nästa steg. </li>\n"
-"                <li> Avsluta %(app)s. Hitta filen media.xml i läsarens "
-"primärminne. Bort det. Koppla ur läsaren. Vänta på att återskapa filen. "
-"Återanslut den och börja %(app)s. </li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1101
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1278
-msgid "Use library only"
-msgstr "Använd bara bibliotek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1102
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1279
-msgid "User annotations generated from main library only"
-msgstr "Användaranteckningar genereras endast från huvudbiblioteket"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1109
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1595
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1690
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1711
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1841
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2024
-msgid "No books selected"
-msgstr "Inga böcker valda"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-msgid "No books selected to fetch annotations from"
-msgstr "Inga böcker valts ut för att hämta anteckningar från"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
-msgid "Merging user annotations into database"
-msgstr "Sammanfoga användareanteckningar i databasen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />Sista sidan Läs: %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />Sista sidan Läs: Plats %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>Plats %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>Sida %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>Läge %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
-msgid "How many empty books?"
-msgstr "Hur många tomma böcker?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
-msgid "How many empty books should be added?"
-msgstr "Hur många tomma böcker ska läggas till?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1371
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1422
-msgid "Uploading books to device."
-msgstr "Laddar upp böcker till enheten."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
-msgid "EPUB Books"
-msgstr "EPUB-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
-msgid "LRF Books"
-msgstr "LRF-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
-msgid "HTML Books"
-msgstr "HTML-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
-msgid "LIT Books"
-msgstr "LIT-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
-msgid "MOBI Books"
-msgstr "MOBI-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
-msgid "Topaz books"
-msgstr "Topaz böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
-msgid "Text books"
-msgstr "Textböcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
-msgid "PDF Books"
-msgstr "PDF-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Comics"
-msgstr "Serier"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "Archives"
-msgstr "Arkiv"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "Supported books"
-msgstr "Stödd böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Merged some books"
-msgstr "Sammanfoga några böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-"Vissa dubbletter hittades och fördes in i följande existerande böcker:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid "Failed to read metadata"
-msgstr "Misslyckades läsa metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
-msgid "Failed to read metadata from the following"
-msgstr "Misslyckades läsa metadat från följande"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
-msgid "Cannot delete"
-msgstr "Kan inte ta bort"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1465
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2193
-msgid "No book selected"
-msgstr "Inga böcker valda"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
-msgid "Choose formats to be deleted"
-msgstr "Välj format som ska tas bort"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "Välj format <b> inte </b> som ska raderas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1531
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"De utvalda böckerna <b> tas permanent bort </b> och filer tas bort från "
-"datorn. Är du säker?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1548
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-"De utvalda böckerna kommer att <b> tas bort permanent </b> från enheten. Är "
-"du säker?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
-msgid "Deleting books from device."
-msgstr "Tar bort böcker från enheten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
-msgid "Cannot download metadata"
-msgstr "Kan inte hämta metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
-msgid "social metadata"
-msgstr "social metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
-msgid "covers"
-msgstr "omslag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
-msgid "metadata"
-msgstr "metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-msgid "Downloading %s for %d book(s)"
-msgstr "Hämtar %s för %d böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
-msgid "Failed to download some metadata"
-msgstr "Misslyckades hämta någon metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
-msgid "Failed to download metadata for the following:"
-msgstr "Misslyckades hämta metadata för följande:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
-msgid "Failed to download metadata:"
-msgstr "Misslyckades hämta metadata:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1651
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1689
-msgid "Cannot edit metadata"
-msgstr "Kan inte redigera metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1710
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1713
-msgid "Cannot merge books"
-msgstr "Kan inte slå samman böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
-msgid "At least two books must be selected for merging"
-msgstr "Minst två böcker måste väljas för sammanslagning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1718
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-"Alla bokformat och metadata från de valda böckerna kommer att läggas till "
-"<b> första valda boken. </B> <br><br> Den andra och övriga valtda böcker "
-"kommer inte tas bort eller ändras. <br><br> Vänligen bekräfta att du vill "
-"fortsätta."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1729
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-"Alla boken format och metadata från de valda böckerna kommer att slås samman "
-"i <b> valda första boken </b>. <br><br> Efter sammanslagningen den andra och "
-"sedan valts ut böcker <b> tas bort </b>. <br><br> Alla boksformat av den "
-"första valda boken kommer att hållas och varje exemplar format i andra och "
-"sedan valts ut böcker kommer att vara permanent <b> bort </b> från din "
-"dator. <br><br> Är du <b> säker </b> du vill fortsätta?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1741
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-"Du håller på att slå ihop fler än fem böcker. Är du <b> säker </b> du vill "
-"fortsätta?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
-msgid "Cannot save to disk"
-msgstr "Kan inte spara till disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
-msgid "Choose destination directory"
-msgstr "Välj målkatalog"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
-msgid "Error while saving"
-msgstr "Fel uppstod vid sparning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
-msgid "There was an error while saving."
-msgstr "Fel uppstod vid sparning."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1884
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Could not save some books"
-msgstr "Kunde inte spara några böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "Click the show details button to see which ones."
-msgstr "Klicka på \"Visa detaljer\" knappen för att se vilken."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
-msgid "No books selected to generate catalog for"
-msgstr "Inga böcker valda för att skapa katalogen för"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
-msgid "Generating %s catalog..."
-msgstr "Skapar %s katalog..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"Inga böcker till katalog\n"
-"Kontrollera uteslutna taggar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
-msgid "Catalog generated."
-msgstr "Katalog genererad."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
-msgid "Export Catalog Directory"
-msgstr "Export katalogen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
-msgid "Select destination for %s.%s"
-msgstr "Välj destination för %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
-msgid "Fetching news from "
-msgstr "Hämtar nyheter från "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
-msgid " fetched."
-msgstr " hämtade."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
-msgid "Cannot convert"
-msgstr "Kan inte omvandla"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
-msgid "Starting conversion of %d book(s)"
-msgstr "Påbörja omvandling av %d böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
-msgid "Cannot view"
-msgstr "Kan inte visa"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
-msgid "Multiple Books Selected"
-msgstr "Flera böcker valda"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-"Du försöker öppna %d böcker. Att öppna för många böcker på en gång kan vara "
-"både långsamt och ha en negativ inverkan på svarstiderna hos din dator. När "
-"väl process startats kan den inte stoppas förrän den är klar. Vill du "
-"fortsätta?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid "Cannot open folder"
-msgstr "Kan inte öppna mapp"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
-msgid "%s has no available formats."
-msgstr "%s har inga tillgängliga format."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "Kan inte konfigurera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "Kan inte konfigurera när det finns jobb som körs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr "Kan inte konfigurera innan calibre startas om."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "Ingen detaljinformation tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Ingen detaljerad information finns tillgänglig för böcker på enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
-msgid "Failed"
-msgstr "Misslyckades"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
-msgid "Error talking to device"
-msgstr "Misslyckades kommunicera med enheten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2380
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Det uppstod ett temporärt fel under kommunikation med enheten. Vänligen "
-"koppla ur och återkoppla enheten och / eller starta om."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
-msgstr "Omvandling misslyckades"
+msgstr "Konverteringen misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
-"<p> Kunde inte konvertera: %s <p> Det är en <a href=\"%s\"> DRM </a> skyddad "
-"bok. Du måste först ta bort DRM mha tredjepartsverktyg."
+"<p>Kunde inte konvertera: %s <p>Det är en <a href=\"%s\">DRM-</a>skyddad "
+"bok. Du måste först ta bort DRM-skyddet med hjälp av tredjepartsverktyg."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "Recept inaktiverat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>Misslyckades</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
-"är resultatet av insatserna från många frivilliga från hela världen. Om du "
-"tycker att det är bra, vänligen överväg att donera till stöd för dess "
-"utveckling."
+"är resultatet av insatserna från många frivilliga över hela världen. Om du "
+"gillar det, överväg att skänka en slant för att stödja dess utveckling."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
-msgstr "Det finns aktiva jobb. Är du säker på att du vill sluta?"
+msgstr "Det finns aktiva jobb. Är du säker på att du vill avsluta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 " kommunicerar med enheten! <br>\n"
-"                      Avsluta kan orsaka skador på enheten. <br>\n"
-"                      Är du säker på att du vill sluta?"
+"                      Om du avslutar nu kan enheten skadas. <br>\n"
+"                      Är du säker på att du vill avsluta ändå?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "VARNING: Aktiva jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
-"fortsätter att köra i systemfältet. FÖr att stänga det, välj <b> Avsluta "
-"</b> i snabbmenyn systemfältet."
+"fortsätter att köra i systemfältet. För att stänga det, välj <b>Avsluta</b> "
+"i snabbmenyn i systemfältet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8237,17 +8368,18 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Senaste version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
-msgstr "Nyare version hittad"
+msgstr "Ny version tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
 msgstr ""
 "%s har uppdaterats till version %s. Se <a href=\"http://calibre-"
-"ebook.com/whats-new\"> för nya funktioner </a>. Besöka nedladdningssidan?"
+"ebook.com/whats-new\">för nya funktioner</a>. Vill du besöka "
+"nedladdningssidan?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
@@ -8311,23 +8443,23 @@ msgstr "Konfigurera e-bokläsare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
-msgstr "Typsnittsalternativ"
+msgstr "Alternativ för teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
-msgstr "Se&rif familjen:"
+msgstr "Se&rif-familjen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
-msgstr "&Sans familjen:"
+msgstr "&Sans-familjen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
-msgstr "&Monospace familj:"
+msgstr "Familj för fast bredd-teckensnitt:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
-msgstr "Stan&dard teckenstorlek:"
+msgstr "Stan&dardteckenstorlek:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:162
@@ -8337,7 +8469,7 @@ msgstr " px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
-msgstr "Monospace teckenstorlek:"
+msgstr "Teckenstorlek för fast bredd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
@@ -8349,11 +8481,11 @@ msgstr "Serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
-msgstr "Sans-serif"
+msgstr "Sans serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
-msgstr "Monospace"
+msgstr "Fast bredd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
@@ -8361,7 +8493,7 @@ msgstr "Kom ihåg senast använda fönsterstorlek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
-msgstr "Maximala &vybredd:"
+msgstr "Maximal &vybredd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
 msgid "H&yphenate (break line in the middle of large words)"
@@ -8373,11 +8505,11 @@ msgid ""
 "specify a language, this will be used."
 msgstr ""
 "Standardspråk som ska användas för avstavningsregler. Om boken inte "
-"specificerar ett språk, kommer det att användas."
+"specificerar ett språk, kommer standardspråket att användas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
-msgstr "Standard språk för avstavning:"
+msgstr "Standardspråk för avstavning:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
@@ -8390,7 +8522,7 @@ msgstr "Användarens stilmall"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
-msgstr "Allmän"
+msgstr "Allmänt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
@@ -8419,53 +8551,54 @@ msgid ""
 "Set the user CSS stylesheet. This can be used to customize the look of all "
 "books."
 msgstr ""
-"Ange användare CSS stylesheet. Detta kan användas för att anpassa utseendet "
-"på alla böcker."
+"Ange personlig CSS-stilmall. Detta kan användas för att anpassa utseendet på "
+"alla böcker."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
-msgstr "Maximal bredd visningsfönstret, i pixlar."
+msgstr "Maximal bredd på visningsfönstret, i pixlar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
-"Ändra storlek på bilder som är större än visningsfönstret för att passa inuti"
+"Ändra storlek på bilder som är större än visningsfönstret för att de skall "
+"få plats inuti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
-msgstr "Avstavningstext"
+msgstr "Avstava text"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
-msgstr "Standardspråk för avstavning regler"
+msgstr "Standardspråk för avstavningsregler"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
-msgstr "Typsnittsalternativ"
+msgstr "Teckensnittsalternativ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
-msgstr "Typsnittsfamilj serif"
+msgstr "Familj för serif-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
-msgstr "Typsnittsfamilj sans-serif"
+msgstr "Familj för sans serif-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
-msgstr "Typsnittsfamilj monospaced"
+msgstr "Familj för fast bredd-teckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
-msgstr "Standard textstorlek i px"
+msgstr "Standardtextstorlek i px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
-msgstr "Typsnitt  monospaced textstorlek i px"
+msgstr "Teckenstorlek för fast bredd i px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
-msgstr "Standard typsnitt"
+msgstr "Typ av standardteckensnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
@@ -8474,7 +8607,7 @@ msgstr "&Leta i ordlista"
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138
 msgid "Go to..."
-msgstr "Gå till ..."
+msgstr "Gå till..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
@@ -8486,19 +8619,19 @@ msgstr "Föregående avsnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
-msgstr "Dokument Start"
+msgstr "Dokumentets början"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
-msgstr "Dokument Slut"
+msgstr "Dokumentets slut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
-msgstr "Avsnitt Start"
+msgstr "Avsnittets början"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
-msgstr "Avsnitt Slut"
+msgstr "Avsnittets slut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
@@ -8506,23 +8639,23 @@ msgstr "Bläddra till nästa sida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
-msgstr "Bläddra till förgående sida"
+msgstr "Bläddra till föregående sida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
-msgstr "Bläddra till nästa sektion"
+msgstr "Bläddra till nästa avsnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
-msgstr "Bläddra till föregående"
+msgstr "Bläddra till föregående avsnitt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
-msgstr "Bläddra till slutet av sektionen"
+msgstr "Bläddra till slutet av avsnittet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
-msgstr "Bläddra till början av sektionen"
+msgstr "Bläddra till början av avsnittet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
@@ -8558,8 +8691,7 @@ msgstr "Plats i bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:191
 msgid "Go to a reference. To get reference numbers, use the reference mode."
-msgstr ""
-"Gå till en referens. För att få referensnummer, använd referens läge."
+msgstr "Gå till en referens. För att få referensnummer, använd referensläge."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
@@ -8571,7 +8703,7 @@ msgstr "Förhandsgranska"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
-msgstr "Ansluta till dict.org att slå upp: <b>%s</b>&hellip;"
+msgstr "Ansluter till dict.org att slå upp: <b>%s</b>&hellip;"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
@@ -8587,19 +8719,19 @@ msgstr "Lägg till bokmärke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
-msgstr "ANge titel för bokmärke:"
+msgstr "Ange titel för bokmärke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
-msgstr "Inga träffar funna för: %s"
+msgstr "Inga träffar hittades för: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
-msgstr "Hämtar flöde..."
+msgstr "Laddar flöde..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
-msgstr "Formar ut %s"
+msgstr "Formaterar %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
@@ -8611,11 +8743,11 @@ msgstr "Laddar e-bok...."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
-msgstr "DRM fel"
+msgstr "DRM-fel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
-msgstr "<p> här boken är skyddat av <a href=\"%s\"> DRM </a>"
+msgstr "<p>Den här boken skyddas av <a href=\"%s\">DRM</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
@@ -8623,16 +8755,17 @@ msgstr "Kunde inte öppna e-bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
-msgstr "Alternativ för att styra e-bokläsare"
+msgstr "Alternativ för att styra läsplattan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:672
 msgid ""
 "If specified, viewer window will try to come to the front when started."
-msgstr "Om angivet, kommer läsfönstret försöka lägga sig främst vid start."
+msgstr ""
+"Om angivet, kommer läsfönstret att försöka lägga sig överst vid start."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
-msgstr "Skriv javaskript notifiering- och konsolmeddelanden till konsolen"
+msgstr "Skriv javaskriptnotifieringar och konsolmeddelanden till konsolen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
 msgid ""
@@ -8666,11 +8799,11 @@ msgstr "Föregående sida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
-msgstr "Större typsnitt"
+msgstr "Öka teckenstorlek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
-msgstr "Mindre typsnitt"
+msgstr "Minska teckenstorlek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
@@ -8720,15 +8853,15 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Skriv ut e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "Kopiera bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "Klista in bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8738,93 +8871,105 @@ msgstr ""
 "%d\n"
 "böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
-"Läsare\n"
+"Läsplatta\n"
 "%s\n"
-"tillgänglig"
+"tillgängligt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
-"Kort A\n"
+"Minneskort A\n"
 "%s\n"
-"tillgänglig"
+"tillgängligt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
-"Kort B\n"
+"Minneskort B\n"
 "%s\n"
-"tillgänglig"
+"tillgängligt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "Klicka för att se böcker som finns på din dator"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Klicka för att se böckerna i primärminnet i din läsare"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Klicka för att se böckerna på lagringskortet A i din läsare"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Klicka för att se böckerna på lagringskortet B i din läsare"
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Klicka för att se böckerna i läsplattans inbyggda minne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Klicka för att se böckerna på minneskort A i läsplattan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Klicka för att se böckerna på minneskort B i läsplattan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr "Böcker finns på"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "Ändra skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
-msgid "Upper Case"
-msgstr "Stora bokstäver"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
-msgid "Lower Case"
-msgstr "Små bokstäver"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+msgid "Upper Case"
+msgstr "Versaler"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+msgid "Lower Case"
+msgstr "Gemener"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "Byt skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "Varje Ord Med Stor Begynnelsebokstav"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr "Drag för att ändra storlek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr "Visa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr "Dölj"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
 "your calibre book collection directly on the device. To do this you have to "
 "turn on the content server."
 msgstr ""
-"Om du använder WordPlayer e-bok programmet på din Android telefon, kan du "
-"öppna din calibre boksamling direkt på enheten. För att göra detta måste du "
-"slå på innehållsservern."
+"Om du använder e-bokprogrammet WordPlayer på din Android-telefon, kan du "
+"öppna ditt Calibre-bibliotek direkt på enheten. För att göra detta måste du "
+"slå på medieservern."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
 msgid ""
 "Remember to leave calibre running as the server only runs as long as calibre "
 "is running."
 msgstr ""
-"Kom ihåg att låta calibre vara igång eftersom server bara kör så länge "
-"calibre är igång."
+"Kom ihåg att låta Calibre vara igång eftersom servern bara körs så länge "
+"Calibre är igång."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
 msgid ""
@@ -8832,9 +8977,9 @@ msgid ""
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
-"Du måste lägga till webbadressen http://myhostname:8080 som ditt calibre "
-"bibliotek i WordPlayer. Här mittvärddatornamn bör vara fullständigt värdnamn "
-"eller IP-adressen för datorn calibre körs på."
+"Du måste lägga till webbadressen http://myhostname:8080 som ditt Calibre-"
+"bibliotek i WordPlayer. Mittvärddatornamn bör vara det fullständiga "
+"värdnamnet eller IP-adressen till datorn Calibre körs på."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
@@ -8843,7 +8988,7 @@ msgstr "Flyttar bibliotek..."
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
-msgstr "Misslyckades att flytta bibliotek"
+msgstr "Kunde inte att flytta bibliotek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
@@ -8854,8 +8999,8 @@ msgid ""
 "<p>An invalid library already exists at %s, delete it before trying to move "
 "the existing library.<br>Error: %s"
 msgstr ""
-"<p> Ett ogiltigt bibliotek finns redan på %s, ta bort det innan du försöker "
-"flytta det befintliga biblioteket. <br> Fel: %s"
+"<p>Ett ogiltigt bibliotek finns redan på %s. Ta bort det innan du försöker "
+"flytta det befintliga biblioteket.<br>Fel: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
@@ -8887,8 +9032,8 @@ msgid ""
 "Choose your book reader. This will set the conversion options to produce "
 "books optimized for your device."
 msgstr ""
-"Välj din bok läsare. Detta kommer att ställa konvertering alternativ för att "
-"producera böcker optimerade för enheten."
+"Välj din läsplatta. Konverteringsalternativen ställs automatiskt in så att "
+"böckerna anpassas för just din läsplatta."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
@@ -8903,7 +9048,7 @@ msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
 "button to apply your settings."
 msgstr ""
-"<h2> Grattis! </h2> Du har framgångsrikt installerat calibre. Tryck på %s "
+"<h2>Grattis!</h2> Du har framgångsrikt installerat Calibre. Tryck på %s-"
 "knappen för att tillämpa inställningarna."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:49
@@ -8911,17 +9056,16 @@ msgid ""
 "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
 "available <a href=\"http://calibre-ebook.com/demo\">online</a>."
 msgstr ""
-"<h2> Demostrationsvideoklipp </h2> Videoklipp som visar de olika "
-"funktionerna i calibre finns <a href=\"http://calibre-ebook.com/demo\"> på "
-"internet</a>."
+"<h2>Demovideor</h2>Videoklipp som visar de olika funktionerna i Calibre "
+"finns på <a href=\"http://calibre-ebook.com/demo\">Internet</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:50
 msgid ""
 "<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-"
 "ebook.com/user_manual\">online</a>."
 msgstr ""
-"<h2> Bruksanvisning </h2> En användarmanual finns även <a "
-"href=\"http://calibre-ebook.com/user_manual\"> på internet</a>."
+"<h2>Bruksanvisning</h2>En användarmanual finns även på <a "
+"href=\"http://calibre-ebook.com/user_manual\">Internet</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:44
 msgid ""
@@ -8931,15 +9075,15 @@ msgid ""
 "button below. You will also have to register your gmail address in your "
 "Amazon account."
 msgstr ""
-"<p> calibre kan automatiskt skicka böcker via e-post till din Kindle. För "
-"att göra det måste du konfigurera e-post nedan. Det enklaste sättet är att "
-"installera ett gratis <a href=\"http://gmail.com\"> Gmail-konto </a> och "
-"klicka på Använd Gmail knappen nedan. Du måste också registrera din Gmail-"
-"adress i ditt Amazon-konto."
+"<p>Calibre kan automatiskt skicka böcker via e-post till din Kindle. För att "
+"göra detta måste du konfigurera e-post nedan. Det enklaste sättet är att "
+"konfigurera ett gratis <a href=\"http://gmail.com\">Gmail-konto</a> och "
+"klicka på knappen \"Använd Gmail\" nedan. Du måste också registrera din "
+"Gmail-adress i ditt Amazon-konto."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
-msgstr "&Kindle e-post:"
+msgstr "E-post för &Kindle:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
@@ -8950,8 +9094,8 @@ msgid ""
 "Choose a location for your books. When you add books to calibre, they will "
 "be copied here:"
 msgstr ""
-"Välj en plats för dina böcker. När du lägger böcker till böcker calibre, "
-"kommer de att kopieras här:"
+"Välj en plats för dina böcker. När du lägger till böcker till Calibre, "
+"kommer de att kopieras hit:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
@@ -8963,13 +9107,13 @@ msgid ""
 "location. If a calibre library already exists at the new location, calibre "
 "will switch to using it."
 msgstr ""
-"Om du har ett befintligt calibre bibliotek, kommer det att kopieras till den "
-"nya platsen. Om ett calibre bibliotek redan finns på den nya platsen, kommer "
-"calibre övergå till att använda det."
+"Om du har ett befintligt Calibre-bibliotek, kommer det att kopieras till den "
+"nya platsen. Om ett Calibre-bibliotek redan finns på den nya platsen, kommer "
+"Calibre att övergå till att använda det."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
-msgstr "Använda: %s:%s @%s:%s och %s kryptering."
+msgstr "Använd: %s:%s @%s:%s- och %s-kryptering."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
@@ -8977,18 +9121,18 @@ msgstr "Skickar..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
-msgstr "Post skickats"
+msgstr "E-post har skickats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
-msgstr "Slutför gmail installation"
+msgstr "Slutför Gmail-installation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:115
 msgid ""
 "Dont forget to enter your gmail username and password. You can sign up for a "
 "free gmail account at http://gmail.com"
 msgstr ""
-"Glöm inte att ange ditt Gmail-användarnamn och lösenord. Du kan registrera "
+"Glöm inte att ange användarnamn och lösenord för Gmail. Du kan registrera "
 "dig för ett gratis Gmail-konto på http://gmail.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:123
@@ -8998,7 +9142,7 @@ msgstr "Felaktig konfiguration"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
-msgstr "Du måste ange e-postavsändaradress"
+msgstr "Du måste ange avsändaradress för e-post"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:131
 msgid "You must set the username and password for the mail server."
@@ -9006,23 +9150,23 @@ msgstr "Du måste ange användarnamn och lösenord för e-postservern."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
-msgstr "Skicka e-post och &från:"
+msgstr "Skicka e-post &från:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:109
 msgid ""
 "<p>This is what will be present in the From: field of emails sent by "
 "calibre.<br> Set it to your email address"
 msgstr ""
-"<p> Detta är vad som kommer att finnas i fältet Från: e-postmeddelanden "
-"skickas med calibre. <br> Ställ in den till din e-postadress"
+"<p>Detta kommer att stå i fältet \"Från\" i den e-post som skickas av "
+"Calibre.<br> Ange din e-postadress."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110
 msgid ""
 "<p>A mail server is useful if the service you are sending mail to only "
 "accepts email from well know mail services."
 msgstr ""
-"<p> en e-postserver är användbart om den tjänst du skickar e-post till "
-"endast tar emot e-post från kända posttjänster."
+"<p>En e-postserver kan användas om tjänsten du skickar e-post till bara "
+"accepterar e-post från välkända e-posttjänster."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
@@ -9031,15 +9175,15 @@ msgstr "E-post&server"
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:112
 msgid "calibre can <b>optionally</b> use a server to send mail"
 msgstr ""
-"calibre kan <b> valfritt </b> använda en server för att skicka e-post"
+"Calibre kan använda en server för att skicka e-post <b>om du vill</b>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
-msgstr "Värddatornamn:"
+msgstr "Värd:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114
 msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
-msgstr "Värdnamnet för e-postservern. För t.ex. smtp.gmail.com"
+msgstr "Värdnamnet för e-postservern, t.ex. smtp.gmail.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
@@ -9048,16 +9192,15 @@ msgstr "&Port:"
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:116
 msgid ""
 "The port your mail server listens for connections on. The default is 25"
-msgstr ""
-"Hamnen din mailserver lyssnar efter anslutningar på. Grundinställning är 25"
+msgstr "Porten som din e-postserver lyssnar på. Grundinställningen är 25."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
-msgstr "Ditt användarnamn på e-postservern"
+msgstr "Ditt användarnamn för e-postservern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
-msgstr "Ditt lösenord på e-postservern"
+msgstr "Ditt lösenord för e-postservern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
@@ -9072,8 +9215,8 @@ msgid ""
 "Use TLS encryption when connecting to the mail server. This is the most "
 "common."
 msgstr ""
-"Använd TLS kryptering när du ansluter till e-postservern. Detta är den "
-"vanligaste."
+"Använd TLS-kryptering när du ansluter till e-postservern. Detta är den "
+"vanligaste krypteringen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
@@ -9093,7 +9236,7 @@ msgstr "Använd Gmail"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
-msgstr "E-post &Test"
+msgstr "&Testa e-post"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:44
 msgid ""
@@ -9102,57 +9245,57 @@ msgid ""
 "directly on the device. To do this you have to turn on the calibre content "
 "server."
 msgstr ""
-"<p> Om du använder <a href=\"http://www.lexcycle.com/download\"> Stanza </a> "
-"e-boksprogrammet på din iPhone / iTouch, kan du öppna din calibre boksamling "
-"direkt på enheten. För att göra detta måste du slå på calibre "
-"innehållsservern."
+"<p>Om du använder e-bokprogrammet <a "
+"href=\"http://www.lexcycle.com/download\">Stanza</a> på din iPhone/iTouch, "
+"kan du öppna ditt Calibre-bibliotek direkt från enheten. För att göra detta "
+"måste du slå på Calibres medieserver."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
-msgstr "Slå på och mediaservern"
+msgstr "Slå på och medieservern"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr "i dag"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:259
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr "i går"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr "denna månad"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:265
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr "dagar sedan"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr "nej"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr "inte ikryssad"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr "ikryssad"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr "ja"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr "tom"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr "tom"
 
@@ -9164,11 +9307,11 @@ msgid ""
 "Default: '%%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
-"Fälten till utgången när katalogisering av böcker i databasen. Ska vara en "
+"Fälten att skriva när böcker i databasen katalogiseras. Ska vara en "
 "kommaseparerad lista med fält. \n"
 "Fält: %s.\n"
 "Grundinställning: '%%default'\n"
-"Gäller: CSV, XML utformat"
+"Gäller CSV- och XML-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:51
 msgid ""
@@ -9177,10 +9320,10 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
-"Utmatningsfältet för att sortera.\n"
-"Fält: author_sort, id, klassificering, storlek, tidsstämpling, titel.\n"
+"Utmatningsfält att sortera efter.\n"
+"Fält: författarsortering, ID, betyg, storlek, tidsstämpling, titel.\n"
 "Grundinställning: \"%default\"\n"
-"Gäller: CSV, XML utformat"
+"Gäller CSV- och XML-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
 msgid ""
@@ -9188,9 +9331,9 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Titel på genererat katalog som används som titel på metadata.\n"
+"Titel på genererad katalog som används som titel i metadata.\n"
 "Grundinställning: '%default'\n"
-"Gäller: ePub, MOBI utformat"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
 msgid ""
@@ -9200,11 +9343,11 @@ msgid ""
 "Default: '%default'None\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Spara utdata från olika stadier av den stegvisa omvandling till den angivna "
-"katalogen. Användbart om du är osäker på vilket stadium i "
-"omvandlingsprocessen en bugg sker.\n"
+"Spara utdata från olika stadier av konverteringen till den angivna "
+"katalogen. Användbart om du är osäker på i vilket stadium i "
+"konverteringsprocessen en bugg sker.\n"
 "Grundinställning: '%default'None\n"
-"Gäller: ePub, MOBI utformat"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
 msgid ""
@@ -9212,10 +9355,10 @@ msgid ""
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Regex beskriver taggar för att utesluta som genrer. \n"
+"Regex-beskrivning av etiketter att utesluta som genrer. \n"
 "Grundinställning: '%default' utesluter etiketter inom hakparenteser, e.g. "
 "'[<tag>]'\n"
-"Gäller: ePub, MOBI utformat"
+"Gäller: ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
 msgid ""
@@ -9225,12 +9368,12 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Kommaseparerad lista med etikettord anger bok bör undantas från produktion. "
-"Skiftlägeskänslig.\n"
-"--exclude-tags=hoppa matchar \"hoppa över den här boken\" och \"Hoppa kommer "
-"att gilla detta\".\n"
+"Kommaseparerad lista med etikettord som anger att boken skall undantas från "
+"utdata. Skiftlägeskänslig.\n"
+"--exclude-tags=hoppa över träffar \"hoppa över den här boken\" och \"Hoppa "
+"kommer att gilla detta\".\n"
 "Grundinställning: '%default'\n"
-"Gäller: ePub, MOBI utformat"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
 msgid ""
@@ -9238,9 +9381,9 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Inkludera \"titlar\" avsnittet i katalogen.\n"
+"Inkludera avsnittet \"titlar\" i katalogen.\n"
 "Grundinställning: \"%default\"\n"
-"Gäller: Epub, MOBI utdataformat"
+"Gäller Epub- och MOBI-utdataformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
 msgid ""
@@ -9248,9 +9391,9 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Inkludera \"Nyligen tillagda avsnittet i katalogen.\n"
+"Inkludera avsnittet \"Nyligen tillagda\" i katalogen.\n"
 "Grundinställning: \"%default\"\n"
-"Gäller: Epub, MOBI utdataformat"
+"Gäller Epub- och MOBI-utdataformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
 msgid ""
@@ -9258,10 +9401,10 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Märkprefix för användaranteckningar, t.ex. '* Jeff kan gilla att läsa detta "
-"\".\n"
+"Märkprefix för användaranteckningar, t.ex. '*Jeff skulle nog gilla att läsa "
+"detta \".\n"
 "Grundinställning: '%default'\n"
-"Gäller: ePub, MOBI utformats"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
@@ -9271,11 +9414,11 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Sortera titlar med ledande tal som text, t.ex.,\n"
-"\"2001: A Space Odyssey\" sorter som\n"
+"Sortera titlar med inledande tal som text, t.ex.,\n"
+"\"2001: A Space Odyssey\" sorteras som\n"
 "\"Two Thousand One: A Space Odyssey\".\n"
 "Grundinställning: \"%default\"\n"
-"Gäller: Epub, MOBI utdataformat"
+"Gäller Epub- och MOBI-utdataformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
 msgid ""
@@ -9287,10 +9430,10 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 "Anger utprofilen. I vissa fall krävs en resultatprofil för att optimera "
-"katalogen för enheten. Till exempel \"tända\" eller \"kindle_dx\" skapar en "
+"katalogen för enheten. \"Kindle\" och \"kindle_dx\" skapar t.ex. en "
 "strukturerad innehållsförteckning med avsnitt och artiklar.\n"
 "Grundinställning: '%default'\n"
-"Gäller: ePub, MOBI utformats"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
 msgid ""
@@ -9298,16 +9441,16 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Tag visar boken har blivit läst.\n"
+"Etikett som visar att boken har lästs.\n"
 "Grundinställning: '%default'\n"
-"Gäller: ePub, MOBI utformats"
+"Gäller ePub- och MOBI-utformat"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:41
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
-"Sökvägen till calibre biblioteket. Standard är att använda sökvägen lagrade "
+"Sökväg till Calibre-biblioteket. Som standard används den sökväg som lagrats "
 "i inställningarna."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:120
@@ -9318,7 +9461,7 @@ msgid ""
 msgstr ""
 "%prog lista [alternativ]\n"
 "\n"
-"Lista de böcker som finns i calibre databasen.\n"
+"Lista de böcker som finns i Calibre-databasen.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:128
 msgid ""
@@ -9332,7 +9475,7 @@ msgstr ""
 "kommaseparerad lista med fält.\n"
 "Tillgängliga fält: %s\n"
 "Grundinställning: %%default. Den särskilda fältet \"alla\" kan användas för "
-"att välja alla fält. Har endast effekt i textutformat."
+"att välja alla fält. Har endast effekt i utformatet text."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:135
 msgid ""
@@ -9340,7 +9483,7 @@ msgid ""
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
-"Fältet för att sortera resultatet efter.\n"
+"Fältet att sortera resultatet efter.\n"
 "Tillgängliga fält: %s\n"
 "Grundinställning: %%default"
 
@@ -9354,22 +9497,20 @@ msgid ""
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
-"Filtrera resultatet av sökfrågan. För utformningen av sökfrågan, se "
-"tillhörande sökdokumentation i bruksanvisningen. Standard är att inte göra "
-"någon filtrering."
+"Filtrera sökningens resultat. För information om sökformatet, se tillhörande "
+"sökdokumentation i bruksanvisningen. Som standard filteras sökningen ej."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
-"Den maximala bredden på en enda rad i utdata. Standard är att upptäcka "
-"skärmstorlek."
+"Den maximala bredden på en enda rad i utdata. Som standard används den "
+"detekterade skärmstorleken."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
-msgstr ""
-"Strängen används för att separera fälten. Standard är ett mellanslag."
+msgstr "Sträng som används för att separera fält. Standard är mellanslag."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
@@ -9405,21 +9546,21 @@ msgid ""
 msgstr ""
 "%prog add [alternativ] fil1 fil2 fil3 ...\n"
 "\n"
-"Lägg de angivna filerna som böcker till databasen. Du kan även ange "
+"Lägg till de angivna filerna som böcker till databasen. Du kan även ange "
 "kataloger, se\n"
-"katalogen relaterade alternativen nedan.\n"
+"katalog-relaterade alternativ nedan.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:276
 msgid ""
 "Assume that each directory has only a single logical book and that all files "
 "in it are different e-book formats of that book"
 msgstr ""
-"Antag att varje katalog har bara en enda logisk bok och att alla filer i den "
-"finns olika e-bk format i stamboken"
+"Antag att varje katalog bara har en enda logisk bok och att alla filer i "
+"katalogen är samma e-bok i olika format."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
-msgstr "Avverka kataloger rekursivt"
+msgstr "Sök igenom kataloger rekursivt"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 msgid ""
@@ -9427,7 +9568,7 @@ msgid ""
 "on book titles."
 msgstr ""
 "Lägg till böcker till databasen även om de redan finns. Jämförelsen görs "
-"baserat på boktitlar."
+"utifrån boktitlarna."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
@@ -9435,19 +9576,19 @@ msgstr "Lägg till en tom bok (en bok utan format)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid "Set the title of the added empty book"
-msgstr "Ange titel av den tillförda tomma boken"
+msgstr "Ange den tillagda tomma bokens titel"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:286
 msgid "Set the authors of the added empty book"
-msgstr "Ange författare av den tillförda tomma boken"
+msgstr "Ange författaren till den tillagda tomma boken"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:288
 msgid "Set the ISBN of the added empty book"
-msgstr "Ange ISBN av den tillförda tomma boken"
+msgstr "Ange den tillagda tomma bokens ISBN-nummer"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
-msgstr "Du måste ange minst en fil för att lägga till"
+msgstr "Du måste ange minst en fil att lägga till"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
@@ -9459,13 +9600,13 @@ msgid ""
 msgstr ""
 "%prog bort ids\n"
 "\n"
-"Ta bort de böcker som identifierats av ID: n från databasen. ID ska vara en "
-"kommaseparerad lista med ID-nummer (du kan få ID-nummer med hjälp av listan "
-"kommando). Exempelvis 23,34,57-85\n"
+"Ta bort de böcker som identifierats av ID:n från databasen. ID ska vara en "
+"kommaseparerad lista med ID-nummer (du kan få ID-nummer med hjälp av "
+"kommandot list). Exempel: 23,34,57-85\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
-msgstr "Du måste ange minst en fil för att ta bort"
+msgstr "Du måste ange minst en bok att ta bort"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
@@ -9478,16 +9619,16 @@ msgstr ""
 "%prog add_format [alternativ] id ebok_fil\n"
 "\n"
 "Lägg e-boken i ebok_fil till tillgängliga format för den logiska boken som "
-"identifieras med id. Du kan få ID genom att använda listkommandot. Om "
+"identifierats med ID. Du kan få ID genom att använda kommandot list. Om "
 "formatet redan existerar, kommer det ersättas.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:378
 msgid "You must specify an id and an ebook file"
-msgstr "Du måste ange ett ID och ett e-bokfil"
+msgstr "Du måste ange ett ID och en e-bokfil"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
-msgstr "e-bok filen måste ha en filändelse"
+msgstr "e-bokfilen måste ha en filändelse"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:391
 msgid ""
@@ -9501,13 +9642,13 @@ msgstr ""
 "\n"
 "%prog remove_format [flaggor] id FMT\n"
 "\n"
-"Ta bort format fmt från den logiska boken som identifieras med id. Du kan få "
-"ID genom att använda listkommandot. FMT bör vara en filtyp som LRF eller TXT "
-"eller Epub. Om logiska boken inte har FMT tillgänglig, gör ingenting.\n"
+"Ta bort formatet FMT från den logiska boken som identifierats med ID. Du kan "
+"få ID genom att använda kommandot list. FMT bör vara en filändelse som LRF, "
+"TXT eller EPUB. Om logiska boken inte har FMT tillgänglig, görs ingenting.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:408
 msgid "You must specify an id and a format"
-msgstr "Du måste ange ett id och ett format"
+msgstr "Du måste ange ett ID och ett format"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
@@ -9521,17 +9662,17 @@ msgstr ""
 "\n"
 "%prog show_metadata [alternativ] id\n"
 "\n"
-"Visa metadata som lagras i calibre databas för boken som identifieras med "
-"id.\n"
+"Visa metadata som lagras i Calibre databas för boken som identifierats med "
+"ID.\n"
 "ID är ett ID-nummer från listkommandot.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
-msgstr "Skriv metadata i OPf form (XML)"
+msgstr "Skriv metadata i OPF-form (XML)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
-msgstr "Du måste ange ett id"
+msgstr "Du måste ange ett ID"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:456
 msgid ""
@@ -9546,17 +9687,17 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 "\n"
-"%prog set_metadata [alternativ] id / sökväg / till / metadata.opf\n"
-"Ange metadata som lagras i Calibres databas för boken som identifieras med "
-"id\n"
-"från OPF-filen metadata.opf. id är ett ID-nummer från listkommandot. Du\n"
+"%prog set_metadata [alternativ] ID/sökväg/till/metadata.opf\n"
+"Ange metadata som lagras i Calibre-databasen för boken som identifieras med "
+"ID\n"
+"från OPF-filen metadata.opf. ID är ett ID-nummer från kommandot list. Du\n"
 "kan få en snabb känsla för OPF-formatet genom att använda växeln --as-opf "
 "med\n"
 "kommandot show_metadata.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:472
 msgid "You must specify an id and a metadata file"
-msgstr "Du måste ange ett id och en metadatafil"
+msgstr "Du måste ange ett ID och en metadatafil"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
@@ -9570,14 +9711,14 @@ msgid ""
 msgstr ""
 "%prog export [flaggor] ids\n"
 "\n"
-"Exportera böckerna som anges av ID: n (en kommaseparerad lista) till "
+"Exportera böckerna som anges av ID:n (en kommaseparerad lista) till "
 "filsystemet.\n"
 "Exportoperationen sparar alla format av boken, omslaget och metadata (i\n"
-"en opf fil). Du kan få ID-nummer från listkommandot.\n"
+"en opf fil). Du kan få ID-nummer från kommandot list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid "Export all books in database, ignoring the list of ids."
-msgstr "Exportera alla böcker i databasen, ignorera listan över ids."
+msgstr "Exportera alla böcker i databasen och ignorera ID-listan."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:502
 msgid "Export books to the specified directory. Default is"
@@ -9585,15 +9726,15 @@ msgstr "Exportera böcker till den angivna katalogen. Standard är"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:504
 msgid "Export all books into a single directory"
-msgstr "Exportera alla böcker i en enda katalog"
+msgstr "Exportera alla böcker till en enda katalog"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:511
 msgid "Specifying this switch will turn this behavior off."
-msgstr "Specificering av den här växeln kommer att stänga av detta beteende."
+msgstr "Om denna växel aktiveras, kommer detta beteende att stängas av."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:534
 msgid "You must specify some ids or the %s option"
-msgstr "Du måste ange några IDs eller %s alternativ"
+msgstr "Du måste ange några ID:n eller %s-alternativet"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:547
 msgid ""
@@ -9605,32 +9746,33 @@ msgid ""
 "column.\n"
 "datatype is one of: {0}\n"
 msgstr ""
-"%prog add_custom_column [flaggor] etikettnamnet datatyp\n"
+"%prog add_custom_column [flaggor] kolumnetikett namn datatyp\n"
 "\n"
-"Skapa en egen kolumn. etikett är det maskinvänliga namnet på kolumnen. Bör\n"
-"inte innehålla blanksteg eller kolon. namn är det mänskinnovänliga namnet på "
+"Skapa en egen kolumn. Kolumnetikett är det maskinvänliga namnet på kolumnen. "
+"Bör\n"
+"inte innehålla blanksteg eller kolon. Namn är det människovänliga namnet på "
 "kolumnen.\n"
-"datatypen är en av: (0)\n"
+"Datatypen är en av: (0)\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
-"Denna kolumn lagrar märke som data (dvs. flera kommaseparerade värden). "
-"Gäller endast om datatypen är text."
+"Denna kolumn lagrar etiketter som data (d.v.s. flera kommaseparerade "
+"värden). Gäller endast om datatypen är text."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:560
 msgid ""
 "A dictionary of options to customize how the data in this column will be "
 "interpreted."
 msgstr ""
-"Ett ordboksalternativ för att anpassa hur informationen i denna kolumn skall "
-"tolkas."
+"Ett uppslagsverk över alternativ för att anpassa hur informationen i denna "
+"kolumn skall tolkas."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
-msgstr "Du måste ange etikett, namn och datatyp"
+msgstr "Du måste ange kolumnetikett, namn och datatyp"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
@@ -9643,12 +9785,12 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    %prog catalog / sökväg / till / destination. (CSV | Epub | mobi | xml "
-"...) [alternativ]\n"
+"    %prog catalog /sökväg/till/destination. (CSV | Epub | mobi | xml ...) "
+"[alternativ]\n"
 "\n"
-"    Exportera en katalog i formatet som sökväg / till / destination "
-"förlängning.\n"
-"    Alternativen styr hur anteckningar visas i den genererade utkatalog.\n"
+"    Exportera en katalog i formatet som som anges som "
+"sökväg/till/destination filändelse.\n"
+"    Alternativen styr hur anteckningar visas i den genererade utkatalogen.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:645
@@ -9657,8 +9799,8 @@ msgid ""
 "If declared, --search is ignored.\n"
 "Default: all"
 msgstr ""
-"Kommaseparerad lista av databas-id till katalogen.\n"
-"Om de deklarerade, är --search ignoreras.\n"
+"Kommaseparerad lista av databas-ID till katalogen.\n"
+"Om de deklareras, ignoreras --search.\n"
 "Grundinställning: alla"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:649
@@ -9667,18 +9809,18 @@ msgid ""
 "please see the search-related documentation in the User Manual.\n"
 "Default: no filtering"
 msgstr ""
-"Filtrera resultatet av sökfrågan. För formatet sökfrågan, se sökrelaterade "
-"dokumentation i bruksanvisningen.\n"
+"Filtrera sökningens resultat. Se sökrelaterad dokumentation i "
+"bruksanvisningen för information om sökformatet.\n"
 "Grundinställning: Ingen filtrering"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Visa detaljerad utdata. Användbart för felsökning"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
-msgstr "Fel: Du måste ange en katalog utfil"
+msgstr "Fel: Du måste ange en katalogutfil"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:688
 msgid ""
@@ -9695,9 +9837,9 @@ msgstr ""
 "    %prog set_custom [flaggor] kolumnen id värde\n"
 "\n"
 "    Sätt värdet på en egen kolumn för boken identifieras av ID.\n"
-"    Du kan få en lista med ID: n med hjälp av listan kommandot.\n"
-"    Du kan få en lista med anpassad kolumnnamn använder custom_columns\n"
-"    kommandot.\n"
+"    Du kan få en lista med ID:n med hjälp av kommandot list.\n"
+"    Du kan få en lista med anpassade kolumnnamn med hjälp av\n"
+"    kommandot custom_columns.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:699
@@ -9705,12 +9847,12 @@ msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
-"Om kolumnen flera värden lagras, lägg angivna värden till de redan "
+"Om kolumnen lagrar flera värden, lägg angivna värden till de redan "
 "befintliga, i stället för att ersätta dem."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:710
 msgid "Error: You must specify a field name, id and value"
-msgstr "Fel: Du måste ange ett fältnamn, id och värde"
+msgstr "Fel: Du måste ange ett fältnamn, ID och värde"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
@@ -9723,7 +9865,7 @@ msgstr ""
 "\n"
 "    %prog custom_columns [flaggor]\n"
 "\n"
-"    Lista anpassade kolumner. Visar kolumnen etiketter och ids.\n"
+"    Lista anpassade kolumner. Visar kolumnetiketter och ID:n.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:736
@@ -9732,7 +9874,7 @@ msgstr "Visa detaljer för varje kolumn."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:748
 msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
-msgstr "Du kommer att förlora alla data i kolumnen:%r. Är du säker (J / N)? "
+msgstr "Du kommer att förlora alla data i kolumnen: %r. Är du säker (j/n)? "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
@@ -9748,10 +9890,10 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    %prog remove_custom_column [flaggor] etikett\n"
+"    %prog remove_custom_column [flaggor] kolumnetikett\n"
 "\n"
 "    Ta bort den anpassade kolumnen som identifieras med etikett. Du kan se\n"
-"    tillgängliga kolumner med custom_columns kommandot.\n"
+"    tillgängliga kolumner med kommandot custom_columns.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:764
@@ -9775,50 +9917,54 @@ msgid ""
 msgstr ""
 "%%prog kommando [alternativ] [argument]\n"
 "\n"
-"%%prog är kommandoradsgränssnitt till calibres bokdatabasen.\n"
+"%%prog är kommandoradsgränssnitt till Calibres bokdatabas.\n"
 "\n"
 "kommando är en av:\n"
 "  %s\n"
 "\n"
-"For help on an individual command: %%prog command --help\n"
+"För hjälp med ett enskilt kommando: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
-msgid "Main"
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
+msgid "Main"
+msgstr "Allmänt"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr "Kort A"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr "Kort B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
-msgstr "<p> Migrera gamla databasen med e-bokbibliotek i%s <br> <center>"
+msgstr "<p>Migrera den gamla databasen till e-bokbibliotek i %s <br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
-msgstr "Kopiering <b>%s</b>"
+msgstr "Kopierar <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
-msgstr "Komprimerande databas"
+msgstr "Komprimerar databas"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
-msgstr "Kontrollerar SQL integritet ..."
+msgstr "Kontrollerar SQL-integritet ..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
-msgstr "Kontroll av saknade filer."
+msgstr "Söker efter saknade filer."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
-msgstr "Kontrollerad id"
+msgstr "ID kontrollerat"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr "Betyg"
 
@@ -9835,8 +9981,8 @@ msgid ""
 "The author sort string. To use only the first letter of the name use "
 "{author_sort[0]}"
 msgstr ""
-"Författaren sortera strängen. Endast använda den första bokstaven i namnet "
-"använda {author_sort[0]}"
+"Författarsorteringsfältet. För att endast använda den första bokstaven i "
+"namnet, använd {author_sort[0]}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
@@ -9851,8 +9997,8 @@ msgid ""
 "The series number. To get leading zeros use {series_index:0>3s} or "
 "{series_index:>3s} for leading spaces"
 msgstr ""
-"Det serienummer. För att få nollor använda (series_index: 0> 3s) eller "
-"(series_index:> 3s) för ledande utrymmen"
+"Numret i serien. För att få nollor använd series_index: 0>3s) eller "
+"(series_index:>3s) för inledande mellanslag"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
@@ -9860,7 +10006,7 @@ msgstr "Betyget"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
-msgstr "ISBN numret"
+msgstr "ISBN-numret"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
@@ -9876,43 +10022,44 @@ msgstr "Utgivningsdatumet"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
-msgstr "calibre-interna id"
+msgstr "Calibres interna ID"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
-msgstr "Alternativ för att kontrollera att spara till disk"
+msgstr "Alternativ för att spara till disk"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54
 msgid ""
 "Normally, calibre will update the metadata in the saved files from what is "
 "in the calibre library. Makes saving to disk slower."
 msgstr ""
-"Normalt kommer calibre uppdatera metadata i de sparade filerna från det som "
-"står i calibre-biblioteket. Gör sparning till disk långsammare."
+"Normalt kommer Calibre att uppdatera metadata i de sparade filerna utifrån "
+"det som finns i Calibre-biblioteket. Detta gör att filerna sparas "
+"långsammare till disken."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57
 msgid ""
 "Normally, calibre will write the metadata into a separate OPF file along "
 "with the actual e-book files."
 msgstr ""
-"Normalt kommer calibre skriva metadata i en separat OPF-fil tillsammans med "
-"själva e-boksfiler."
+"Normalt kommer Calibre skriva metadata i en separat OPF-fil tillsammans med "
+"själva e-bokfilerna."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:60
 msgid ""
 "Normally, calibre will save the cover in a separate file along with the "
 "actual e-book file(s)."
 msgstr ""
-"Normalt kommer calibre spara omslaget i en separat fil tillsammans med "
-"själva e-boksfil(er)."
+"Normalt kommer Calibre att spara omslaget i en separat fil tillsammans med "
+"själva e-bokfilerna."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:63
 msgid ""
 "Comma separated list of formats to save for each book. By default all "
 "available books are saved."
 msgstr ""
-"Kommaseparerad lista av format för att spara för varje bok. Som standard "
-"sparas alla tillgängliga böcker."
+"Kommaseparerad lista av format att spara för varje bok. Som standard sparas "
+"alla tillgängliga böcker."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:66
 msgid ""
@@ -9921,9 +10068,9 @@ msgid ""
 "subdirectory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
-"Mallen att kontrollera filnamnet och katalogstrukturen av de sparade "
-"filerna. Standard är \"%s\" som kan spara böcker till en per-författare "
-"underkatalog med filnamn som innehåller titel och författare. Tillgängliga "
+"Mallen för att kontrollera de sparade filernas namn och katalogstruktur. "
+"Standard är \"%s\" som kommer att spara böcker till författarspecifika "
+"underkataloger med filnamn som innehåller titel och författare. Tillgängliga "
 "kontroller: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
@@ -9933,10 +10080,10 @@ msgid ""
 "directory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
-"Mallen att kontrollera filnamnet och katalogstrukturen av filer som sänds "
-"till enheten. Standard är \"%s\" som kan spara böcker till en per-författare "
-"katalog med filnamn som innehåller titel och författare. Tillgängliga "
-"kontroller: {%s}"
+"Mallen för att kontrollera filnamnet och katalogstrukturen för filer som "
+"sänds till enheten. Standard är \"%s\" som kommer att spara böcker till en "
+"författarspecifika kataloger med filnamn som innehåller titel och "
+"författare. Tillgängliga kontroller: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78
 msgid ""
@@ -9945,18 +10092,18 @@ msgid ""
 "experience errors when saving, depending on how well the filesystem you are "
 "saving to supports unicode."
 msgstr ""
-"Normalt kommer calibre konvertera alla icke engelska tecken till engelska "
-"motsvarigheter till filnamnen. VARNING: Om du stänga av denna funktion kan "
-"det uppstå fel vid sparande, beroende på hur väl filsystemet du sparar till "
-"har stöd för unicode."
+"Normalt kommer Calibre att konvertera alla icke-engelska i filnamnet till "
+"engelska motsvarigheter. VARNING: Om du stänga av denna funktion kan det "
+"uppstå fel vid sparande, beroende på hur väl filsystemet du sparar till "
+"stöder Unicode."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:84
 msgid ""
 "The format in which to display dates. %d - day, %b - month, %Y - year. "
 "Default is: %b, %Y"
 msgstr ""
-"I vilket format för att visa datum. %d - day, %b - månad, %Y - year. "
-"Grundinställning är: %b%Y"
+"Formatet för att visa datum. %d - day, %b - månad, %Y - year. "
+"Grundinställning är: %b, %Y"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
@@ -9972,7 +10119,7 @@ msgstr "Efterfrågade format finns inte"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
 msgid "Settings to control the calibre content server"
-msgstr "Inställningar för att kontrollera calibre innehållsservern"
+msgstr "Inställningar för att kontrollera Calibres medieserver"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
 msgid "The port on which to listen. Default is %default"
@@ -9980,21 +10127,21 @@ msgstr "Port att lyssna på. Grundinställning är %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
 msgid "The server timeout in seconds. Default is %default"
-msgstr "För server-timeout i sekunder. Grundinställning är %default"
+msgstr "Server-timeout i sekunder. Grundinställning är %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
 msgid "The max number of worker threads to use. Default is %default"
-msgstr "Max antal arbetstrådar att använda.Grundinställning är %default"
+msgstr "Max antal arbetstrådar att använda. Grundinställning är %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
 msgid "Set a password to restrict access. By default access is unrestricted."
 msgstr ""
-"Ange ett lösenord för att begränsa tillgången. Som standard är tillgången "
-"obegränsad."
+"Ange ett lösenord för att kontrollera behörigheten. Som standard finns ingen "
+"behörighetskontroll."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
 msgid "Username for access. By default, it is: %default"
-msgstr "Användarnamn för åtkomst. Som standard är det %default."
+msgstr "Användarnamn för behörighet. Som standard är det %default."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
 msgid "The maximum size for displayed covers. Default is %default."
@@ -10006,13 +10153,22 @@ msgid ""
 "The maximum number of matches to return per OPDS query. This affects Stanza, "
 "WordPlayer, etc. integration."
 msgstr ""
-"Det maximala antalet matcher att återvända per OPDS fråga. Detta påverkar "
-"Stanza, WordPlayer osv integration."
+"Det maximala antalet matcher skicka per OPDS-fråga. Detta påverkar "
+"integrationen med Stanza, WordPlayer, m.fl.."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+"Gruppera poster i kategorier som författare/etiketter efter första bokstaven "
+"när det finns fler än detta antal poster. Grundinställning: %default. Ange "
+"ett stort tal för att inaktivera gruppering."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
-msgstr ""
-"Lösenord för att komma åt din calibre-biblioteket. Användarnamnet är "
+msgstr "Lösenord för att komma åt ditt Calibre-bibliotek. Användarnamnet är "
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
@@ -10022,53 +10178,53 @@ msgid ""
 msgstr ""
 "[alternativ]\n"
 "\n"
-"Starta kaliber innehåll servern."
+"Starta Calibres medieserver."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
 msgid "Path to the library folder to serve with the content server"
-msgstr "Sökväg till mappen Bibliotek att tjäna med innehållet server"
+msgstr "Sökväg till biblioteksmappen som medieservern skall dela ut"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
 msgid "Write process PID to the specified file"
-msgstr "Skriv process PID till angiven fil"
+msgstr "Skriv process-PID till angiven fil"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr "%d böcker"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
-msgstr ""
+msgstr "%d föremål"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr "BETYG: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr "TAGGAR: %s<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr "SERIER: %s [%s]<br />"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr "Bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr "Böcker i ditt bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr "Genom att "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr "Böcker sorterade efter "
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr "Nyaste"
 
@@ -10085,8 +10241,8 @@ msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
-"Närhelst du skickar argument till %prog som har mellanslag i dem, bifoga "
-"argumenten med citattecken."
+"När du skickar argument till %prog som har mellanslag i dem, omge argumenten "
+"med citattecken."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:670
 msgid "Path to the database in which books are stored"
@@ -10094,7 +10250,7 @@ msgstr "Sökvägen till den databas där böcker finns lagrade"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
-msgstr "Mönster att gissa metadata från filnamn"
+msgstr "Mönster för att gissa metadata från filnamn"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
@@ -10102,19 +10258,19 @@ msgstr "Accessnyckel för isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
-msgstr "Standard tidsbegränsning för nätdrift (sekunder)"
+msgstr "Tidsgräns för nätverksoperationer (sekunder)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
-msgstr "Sökvägen till katalogen där ditt bibliotek med böcker lagras"
+msgstr "Sökvägen till katalogen där ditt bibliotek lagras"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
-msgstr "Vilket språk som ska visas i användargränssnittet"
+msgstr "Det språk som skall användas av användargränssnittet"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:682
 msgid "The default output format for ebook conversions."
-msgstr "Standardutdataformatet för e-bokomvandlingar."
+msgstr "Standardformat för utdata vid e-bokskonverteringar."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:686
 msgid "Ordered list of formats to prefer for input."
@@ -10130,7 +10286,7 @@ msgstr "Prioritet för arbetsprocesser"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:692
 msgid "Swap author first and last names when reading metadata"
-msgstr "Växla mellan författares för- och efternamn vid läsning av metadata"
+msgstr "Byt plats på författares för- och efternamn vid läsning av metadata"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
@@ -10154,7 +10310,7 @@ msgstr "Stoppad"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
-msgstr "Klar"
+msgstr "Klart"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
@@ -10178,7 +10334,7 @@ msgstr "Kinesiska (HK)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
-msgstr "Kinesiska (Traditionell)"
+msgstr "Kinesiska (traditionell)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
@@ -10206,77 +10362,81 @@ msgstr "Engelska (Thailand)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
-msgstr "Engelska (Cyprus)"
+msgstr "Engelska (Cypern)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr "Engelska (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "Engelska (Singapore)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
-msgstr "Engelska (Yemen)"
-
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+msgid "English (Yemen)"
+msgstr "Engelska (Jemen)"
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "Engelska (Irland)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr "Engelska (Kina)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "Spanska (Paraguay)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "Tyska (Österrike)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "Holländska (Nederländerna)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "Holländska (Belgien)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
-msgstr "Adressen måste ha programmet sftp"
+msgstr "Adressen måste ha formen sftp"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
-msgstr "värden måste ha formen användarnamn@värdnamn"
+msgstr "värden måste anges som användarnamn@värdnamn"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
-msgstr "Misslyckades med att förhandla SSH-session: "
+msgstr "Kunde inte få till stånd SSH-session: "
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
-msgstr "Gick inte att verifiera med server: %s"
+msgstr "Kunde ej autentisera med server: %s"
 
 #: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr "Styr e-postleverans"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
 msgid "Unknown feed"
 msgstr "Okänt flöde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
 msgid "Untitled article"
 msgstr "Okänd artikel"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
-msgstr "Hämta periodiska innehåll från Internet"
+msgstr "Hämta periodiskt material från Internet"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:36
 msgid ""
@@ -10284,7 +10444,7 @@ msgid ""
 "downloads at most 2 feeds."
 msgstr ""
 "Användbart för receptutveckling. Sätter max_articles_per_feed till 2 och "
-"nedladdningar högst 2 flöden."
+"hämtningar till högst 2 flöden."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:39
 msgid "Username for sites that require a login to access content."
@@ -10301,108 +10461,108 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:46
 msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
-msgstr "Hämta inte senaste versionen av inbyggda recept från calibre-servern"
+msgstr "Hämta inte senaste versionen av inbyggda recept från Calibre-servern"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Okänd nyhetskälla"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
-msgstr "\"%s\" receptet behöver ett användarnamn och lösenord."
+msgstr "\"%s\"-receptet behöver ett användarnamn och lösenord."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "Hämtningen är färdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
-msgstr "Misslyckades med att hämta följande artiklar:"
+msgstr "Kunde inte hämta följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
-msgstr "Misslyckades med att hämta  delar av följande artiklar:"
+msgstr "Kunde inte hämta delar av följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " från "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\tMisslyckade länkar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
-msgstr "Kunde inte hämta artikel. Kör med-vv för att se orsaken"
+msgstr "Kunde inte hämta artikel. Kör med -vv för att se orsaken"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "Hämtar flöden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
-msgstr "Fick flöden från indexsidan"
+msgstr "Mottagit flöden från indexsidan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "Försöker hämta omslaget ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
-msgstr "Skapar masthead..."
+msgstr "Skapar redaktionsruta..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
-msgstr "Påbörjar hämtning [%d thread(s)]..."
+msgstr "Påbörjar hämtning [%d tråd(ar)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
-msgstr "Flöden ner laddningade till %s"
+msgstr "Flöden hämtade till %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
-msgstr "Kunde inte ladda ner omslag: %s"
+msgstr "Kunde inte hämta omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
-msgstr "Laddar ner omslag från %s"
+msgstr "Hämtar omslag från %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
-msgstr "Masthead bild hämtad"
+msgstr "Redaktionslogga hämtad"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
-msgstr "Namnlös Artikel"
+msgstr "Namnlös artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
-msgstr "Artikel nerladdad: %s"
+msgstr "Artikel hämtad: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
-msgstr "Artikelnerladdning misslyckades: %s"
+msgstr "Artikeln kunde inte hämtas: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Hämtar flöde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
-"Misslyckades med att logga in, kontrollera ditt användarnamn och lösenord "
-"för kaliber Periodicals tjänsten."
+"Kunde inte logga in, kontrollera ditt användarnamn och lösenord för Calibres "
+"prenumerationstjänst."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
 msgstr ""
-"Du har inte tillstånd att ladda ned denna fråga. Antingen ditt abonnemang "
-"har gått ut eller du har överskridit den högsta tillåtna nedladdningar för "
-"idag."
+"Du har inte tillstånd att hämta detta nummer. Antingen har din prenumeration "
+"gått ut eller så du har överskridit det högsta antalet tillåtna hämtningar "
+"för i dag."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
@@ -10419,7 +10579,7 @@ msgstr "Schemalagd"
 msgid "Custom"
 msgstr "Anpassad"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10427,63 +10587,62 @@ msgid ""
 msgstr ""
 "%prog URL\n"
 "\n"
-"Där webbadressen är till exempel http://google.com"
+"Där URL är t.ex. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
-msgstr "Baskatalogen i vilken webbadress sparas. Grundinställning %default"
+msgstr "Baskatalogen där webbadressen sparas. Grundinställningen är %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
-"Tidsgräns i sekunder för att vänta på ett svar från servern. "
-"Grundinställning %default"
+"Tidsgräns i sekunder att vänta på ett svar från servern. Grundinställning "
+"%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
-"Maximalt antal nivåer av upprepning dvs länkdjup att följa. Grundinställning "
-"%default"
+"Maximalt antal nivåer, d.v.s. länkdjup, att följa. Grundinställning %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
-"Det maximala antal filer att ladda ner. Endast för filer med <a href> "
-"taggar. Grundinställning är %default"
+"Det maximala antal filer att hämta. Endast för filer med <a href>-taggar. "
+"Grundinställning är %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
-"Minsta intervall i sekunder mellan varandra följande hämtar. "
+"Minsta intervall i sekunder mellan på varandra följandande hämtningar. "
 "Grundinställning är %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
-"Teckenkodning för de webbplatser som du försöker ladda ner. Grundinställning "
+"Teckenkodning för de webbplatser som du försöker hämta. Grundinställningen "
 "är att försöka gissa kodningen."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 "Endast länkar som matchar det reguljära uttrycket kommer att följas. Detta "
-"alternativ kan anges flera gånger, i vilket fall så länge som en länk "
-"matchar någon regexp, kommer det att följas. Som standard följs alla länkar ."
+"alternativ kan anges flera gånger. Då kommer länkar att följas så länge de "
+"matchar det reguljära uttrycket. Som standard följs alla länkar ."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -10492,14 +10651,14 @@ msgid ""
 "applied first."
 msgstr ""
 "Varje länk som matchar det reguljära uttrycket kommer att ignoreras. Detta "
-"alternativ kan anges flera gånger, i vilket fall så länge något regexp "
-"matchar en länk, blir det ignorat.Grundinställning är att inga länkar "
-"ignoreras. Om både --filter-regexp och --match-regexp anges så används  --"
-"filter-regexp först."
+"alternativ kan anges flera gånger. Då kommer alla länkar som matchar det "
+"reguljära uttrycket att ignoreras. Som standard ignoreras inga länkar. Om "
+"både --filter-regexp och --match-regexp anges så används --filter-regexp "
+"först."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
-msgstr "Ladda inte ner CSS stilmallar."
+msgstr "Hämta inte CSS-stilmallar."
 
 #~ msgid "The reader has no storage card connected."
 #~ msgstr "Läsaren har inga minneskort inkopplade."
@@ -10510,12 +10669,6 @@ msgstr "Ladda inte ner CSS stilmallar."
 #~ msgid "Communicate with the Cybook Opus eBook reader."
 #~ msgstr "Kommunicera med Cybook Opus e-boksläsare."
 
-#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-#~ msgstr "Kommunicera med Sony PRS-300/505/500 e-boksläsare."
-
-#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-#~ msgstr "Kommunicera med Sony PRS-600/700/900 e-boksläsare."
-
 #~ msgid ""
 #~ "Do not force text to be justified in output. Whether text is actually "
 #~ "displayed justified or not depends on whether the ebook format and reading "
@@ -10552,36 +10705,17 @@ msgstr "Ladda inte ner CSS stilmallar."
 #~ msgid "~"
 #~ msgstr "~"
 
-#~ msgid "Send specific format to storage card B"
-#~ msgstr "Skicka angivet format till lagringskort B"
-
 #~ msgid "and delete from library"
 #~ msgstr "och ta bort från biblioteket"
 
-#~ msgid "Send specific format to storage card A"
-#~ msgstr "Skicka angivet format till lagringskort A"
-
-#~ msgid "Send specific format to main memory"
-#~ msgstr "Skicka till angivet format till primärminnet"
-
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr "calibre kan skicka böcker till dig (eller dina läsare) via e-post"
 
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "Klicka för att stänga omslagsbläddring"
 
-#~ msgid "Click to browse books by their covers"
-#~ msgstr "Klicka för att bläddra böcker bland omslag"
-
-#~ msgid "Click to browse books by tags"
-#~ msgstr "Klicka för att bläddra böcker efter taggar"
-
-#~ msgid ""
-#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-#~ "module failed:<br>"
-#~ msgstr ""
-#~ "<p> Bläddra böcker bland deras omslag är inaktiverad. <br> Import av "
-#~ "pictureflow modul misslyckades: <br>"
+#~ msgid "Device database corrupted"
+#~ msgstr "Enhetsdatabas skadad"
 
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Välj en plats för ditt e-bokbibliotek"
@@ -10628,13 +10762,6 @@ msgstr "Ladda inte ner CSS stilmallar."
 #~ "Grundinställning: \"%default\"\n"
 #~ "Gäller: CSV, XML utformat"
 
-#~ msgid ""
-#~ "The format in which to output the data. Available choices: %s. Defaults is "
-#~ "text."
-#~ msgstr ""
-#~ "I vilket format för utmatning av data. Tillgängliga val: %s. Standard är "
-#~ "text."
-
 #~ msgid "E-book Options"
 #~ msgstr "E-book alternativ"
 
@@ -10653,14 +10780,23 @@ msgstr "Ladda inte ner CSS stilmallar."
 #~ msgid "original"
 #~ msgstr "original"
 
-#~ msgid "Editing meta information for %d books"
-#~ msgstr "Redigera metainformation för%d böcker"
-
 #~ msgid "Merge books"
 #~ msgstr "Sammanfoga böcker"
 
-#~ msgid "(%d found)"
-#~ msgstr "(%d funna)"
-
 #~ msgid "left"
 #~ msgstr "västerkant"
+
+#~ msgid "Side bar"
+#~ msgstr "Sidram"
+
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "Sortera etikettlista efter popularitet"
+
+#~ msgid "Sort by &popularity"
+#~ msgstr "Sortera efter &popularitet"
+
+#~ msgid "Rename"
+#~ msgstr "Byt namn"
+
+#~ msgid "Manage "
+#~ msgstr "Hantera "
diff --git a/src/calibre/translations/tr.po b/src/calibre/translations/tr.po
index 73ab70f8b6..2e4f9e379f 100644
--- a/src/calibre/translations/tr.po
+++ b/src/calibre/translations/tr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:47+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:01+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,12 +23,12 @@ msgstr "Hiçbir şey yapmaz"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -40,22 +40,22 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -101,44 +101,46 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -293,62 +295,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Bu profil SONY PRS 300'ü hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Bu profil SONY PRS 900'ü hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Bu profil Microsoft Reader'ı hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Bu profil Mobipocket kitaplarını hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Bu profil Hanlin V3 ve klonlarını hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Bu profil Hanlin V5 ve klonlarını hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "Bu profil Hanlin Cybook G3'ü hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Bu profil Cybook Opus'u hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Bu profil Amazon Kindle'ı hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Bu profil Irex Illiad'ı hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Bu profil IRex Digital Reader 1000'i hedefler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Bu profil IREX Dijital Reader 800 içindir."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "Bu profil B&N Nook'u hedefler."
 
@@ -374,15 +376,15 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Bu profil SONY PRS-300'ü hedefler."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Bu profil 5 inç JetBook'u hedefler."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -390,7 +392,7 @@ msgstr ""
 "Bu profil SONY PRS serisini hedefler. Ör. 500/505/700 vb. ya da yatık "
 "konumda. Temel olarak çizgi romanlar için faydalıdır."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Bu profil Amazon Kindle DX'i hedefler."
 
@@ -410,15 +412,19 @@ msgstr "Yerel eklenti özelleştirme"
 msgid "Disabled plugins"
 msgstr "Çalışmayan eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "de geçerli bir eklenti bulunamadı. "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "%s eklentisi şu geri dönüş ile başlatılamadı:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -430,18 +436,18 @@ msgstr ""
 "    Harici eklentiler yükleyerek Calibre'ye özelleştirin.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Eklentiyi içeren ZIP dosyasının bulunduğu yeri belirterek eklenti ekleyin."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "İsminden yararlanarak özel bir eklentiyi çıkart. Programla gelen eklentiler "
 "üzerinde etkisi yoktur."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -449,15 +455,15 @@ msgstr ""
 "Eklentiyi özelleştir. Eklenti ismiyle özelleştirme dizesini virgülle "
 "ayırarak belirleyin."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Kurulu eklentileri listele"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçerli"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçersiz"
 
@@ -471,59 +477,70 @@ msgid ""
 "first one that exists will be used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "S60 telefonlar ile haberleş."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "aygıt sürücüleri için ayarlar"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "Belirtilen donanım için listelenmiş biçimler kabul edilebilir ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Haberler"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Binatone Readme eBook reader ile bağlantı kur"
@@ -546,6 +563,10 @@ msgstr "Cybook Gen 3 / Opus eBook reader ile bağlantı kur"
 msgid "Communicate with the EB600 eBook reader."
 msgstr "EB600 eBook reader ile bağlantı kur"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -558,6 +579,10 @@ msgstr "Entourage Edge ile haberleş."
 msgid "Communicate with the ESlick eBook reader."
 msgstr "ESlick eBook reader ile bağlantı kur"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -572,14 +597,20 @@ msgstr "Araç arayüzü"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Hanlin V3 serisi eBook readerlar ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Hanlin V5 serisi eBook readerlar ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "BOOX eBook reader ile bağlantı kur"
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Hanvon N520 eBook reader ile bağlantı kur"
@@ -606,7 +637,7 @@ msgstr "IRex Iliad eBook reader ile bağlantı kur"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -626,15 +657,15 @@ msgstr "Iriver Story reader ile bağlantı kur"
 msgid "Communicate with the JetBook eBook reader."
 msgstr "JetBook eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Kindle eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Kindle 2 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Kindle DX eBook reader ile bağlantı kur"
 
@@ -678,13 +709,13 @@ msgstr "Sony PRS-500 eBook reader ile bağlantı kur"
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "İsimsiz"
@@ -705,61 +736,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr "iPapyrus okuyucu ile iletişim kur."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "%s disk sürücüsü tespit edilemedi. Yeniden başlatmayı deneyin."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "%s bağlantı noktası bulunamadı. Yeniden başlatmayı deneyin."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "%s disk sürücüsü bulunamıyor."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "Bağlama yardımcısı bulunamıyor:  %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Ana hafıza monte edilemiyor (Hata kodu: %d)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "Seçilen yuva : %s desteklenmiyor."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "Ana hafızada yeterli boş alan yok ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "Saklama kartında yeterli boş yer yok."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "Haberler"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Aygıtı Yapılandır"
@@ -769,57 +789,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "Donanım destekliyor ise, dosyaları alt dizinlerde bulundur."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Metadataları donanımdaki dosyalardan oku."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "Kitapların nasıl kaydedileceğine ilişkin kontrol şeması"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "Ekstra kişiselleştirme"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "e-Kitap okuyucusu ile haberleş."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Aygıt bilgisini al..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "Cihazdaki kitapların listesi alınıyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "Kitaplar cihaza aktarılıyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "Donanım metadata listesine kitaplar ekleniyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "Cihazdaki kitaplar kaldırılıyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "Donanım  metadata listesinden  kitaplar çıkarılıyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "Metadata bilgileri cihaza gönderiliyor..."
 
@@ -1418,15 +1442,15 @@ msgstr ""
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "Girdi HTML ye çevriliyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "E-kitap dönüştürmeleri çalışıyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "Oluşturuluyor"
 
@@ -1736,84 +1760,88 @@ msgstr ""
 msgid "Comic"
 msgstr "Karikatür"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Eser Adı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Yazar(lar)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Yayıncı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Yapımcı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Açıklamalar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seriler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Dil"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Zaman damgası"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Yayınlandı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Haklar"
 
@@ -1821,7 +1849,7 @@ msgstr "Haklar"
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1920,6 +1948,10 @@ msgstr ""
 msgid "No cover found"
 msgstr "Kapak bulunmadı"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
@@ -1958,6 +1990,10 @@ msgstr ""
 msgid "Downloads social metadata from amazon.com"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2014,7 +2050,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Kapak"
@@ -2298,6 +2334,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Yazar"
 
@@ -2503,7 +2541,7 @@ msgid "Use Roman numerals for series number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
@@ -2580,23 +2618,416 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopyalandı"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "Kopyala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "Panoya Kopyala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "dosyaları Seç"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "Disk'e kayıt edilemiyor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "Kitap bulunmadı"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
@@ -2618,15 +3049,10 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "Kitap yok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "Kitap bulunmadı"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Eklendi"
@@ -2745,17 +3171,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2774,17 +3200,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2806,6 +3232,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML Seçenekleri"
@@ -2865,7 +3343,7 @@ msgstr "çıktı"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2883,8 +3361,8 @@ msgstr "E-kitap seçenekleri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3564,11 +4042,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "RB Çıktısı"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3649,12 +4122,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3862,11 +4335,19 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3887,279 +4368,291 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
@@ -4302,165 +4795,165 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4571,279 +5064,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4854,33 +5356,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4917,10 +5419,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Tarih"
 
@@ -4936,68 +5439,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5106,6 +5610,27 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -5312,11 +5837,6 @@ msgstr ""
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
@@ -5355,67 +5875,75 @@ msgstr ""
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -5772,12 +6300,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr ""
 
@@ -5890,12 +6418,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -5927,25 +6455,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6187,11 +6715,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -6227,54 +6755,203 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "Diske kaydet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
@@ -6286,112 +6963,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "Boyut (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6487,282 +7142,253 @@ msgstr ""
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "Kitaplar Ekle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "Kitapları Sil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "Diske kaydet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -6792,15 +7418,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -6861,82 +7507,75 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -6978,619 +7617,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "Disk'e kayıt edilemiyor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8057,82 +8189,94 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8393,48 +8537,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -8812,7 +8956,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8893,43 +9037,47 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9115,43 +9263,43 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9294,34 +9442,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
+msgid "Spanish (Paraguay)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
+msgid "German (AT)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -9378,91 +9530,91 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "Başlıksız Yazı"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "Besleme alınıyor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -9470,7 +9622,7 @@ msgstr ""
 "Giriş başarısız , calibre Süreli servisleri için kullanıcı adınız ve "
 "şifrenizi kontrol ediniz ."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9491,18 +9643,18 @@ msgstr "Zamanlanmış"
 msgid "Custom"
 msgstr "Özel tanımlı"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -9510,38 +9662,38 @@ msgstr ""
 "Sunucu cevabı için, saniye olarak zaman aşımı bekleme süresi . Varsayılan : "
 "%default sn"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9550,7 +9702,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "CSS stil yüklemeyin"
 
diff --git a/src/calibre/translations/vi.po b/src/calibre/translations/vi.po
index 068273b51d..3fa550e0b1 100644
--- a/src/calibre/translations/vi.po
+++ b/src/calibre/translations/vi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-18 13:18+0000\n"
-"PO-Revision-Date: 2010-04-18 10:58+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:21+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-19 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,39 +23,39 @@ msgstr "hoàn toàn không thực thi"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:204
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:319
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:329
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:332
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:35
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:903
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -63,20 +63,20 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:38
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:76
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:117
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:151
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:609
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:808
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:810
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:610
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:816
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:980
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:908
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:913
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:979
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:173
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:39
@@ -97,66 +97,71 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:28
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:583
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:964
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1091
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:311
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:248
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:260
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:680
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:717
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1108
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1110
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1232
-#: /home/kovid/work/calibre/src/calibre/library/server.py:671
-#: /home/kovid/work/calibre/src/calibre/library/server.py:747
-#: /home/kovid/work/calibre/src/calibre/library/server.py:794
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
+#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:50
 msgid "Unknown"
-msgstr "Vô danh"
+msgstr "Chưa xác định."
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
-msgstr "Gốc"
+msgstr "Cơ sở"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
-msgstr "Loại"
+msgstr "Kiểu tập tin"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr ""
 
@@ -170,6 +175,9 @@ msgid ""
 "linked files. This plugin is run every time you add an HTML file to the "
 "library."
 msgstr ""
+"Truy cập tất cả các đường dẫn nội bộ trong mộttập tin HTML và tạo một tập "
+"tin nén chứa tất cả các file được dẫn tới. Plugin này sẽ chạy mỗi khi bạn bổ "
+"sung một tập tin HTML vào thư viện."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:50
 msgid ""
@@ -186,47 +194,47 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
-msgstr "Trích bìa từ file truyện tranh"
+msgstr "Trích bìa từ các tập tin truyện tranh"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:121
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:133
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:164
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:225
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:236
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:248
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:280
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:127
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:139
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:149
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:159
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:170
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:180
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:190
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:200
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:210
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:220
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:231
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:242
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:254
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:286
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:296
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:306
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:259
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
-msgstr "Đọc dữ liệu nhúng trong file nén kiểu RAR"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:311
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Đọc dữ liệu nhúng trong file nén kiểu ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:322
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:332
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:342
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:364
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:375
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:385
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:328
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:338
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:348
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:370
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:381
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:391
 msgid "Set metadata in %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:353
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr ""
 
@@ -241,6 +249,10 @@ msgid ""
 "useful for documents that do not declare an encoding or that have erroneous "
 "encoding declarations."
 msgstr ""
+"Xác định định dạng ngôn ngữ của văn bản được nhập vào. Nếu đã được thiết "
+"lập, tuỳ chọn này sẽ vô hiệu hoá tất cả định dạng của bản thân văn bản. "
+"Thuận tiện với các văn bản không nêu rõ  hoặc gặp lỗi trong quá trình xác "
+"định định dạng ngôn ngữ."
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
@@ -251,119 +263,130 @@ msgid ""
 "If specified, the output plugin will try to create output that is as human "
 "readable as possible. May not have any effect for some output plugins."
 msgstr ""
+"Nếu được thiết lập, plugin xuất dữ liệu sẽ tạo file xuất dễ đọc nhất có thể. "
+"Đôi khi không hiệu quả với một số tiện ích xuất dữ liệu khác,"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:44
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:48
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49
 msgid ""
 "This profile tries to provide sane defaults and is useful if you know "
 "nothing about the input document."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:56
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:255
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:266
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:68
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:77
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:85
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:96
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:109
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:121
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:343
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:131
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:351
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:144
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:364
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:156
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:168
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:421
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:193
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:435
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:205
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:225
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:230
 msgid ""
 "This profile tries to provide sane defaults and is useful if you want to "
 "produce a document intended to be read at a computer or on a range of "
 "devices."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:268
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
+msgid ""
+"Intended for the iPad and similar devices with a resolution of 768x1024"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
+msgid "This profile is intended for the Kobo Reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:286
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:295
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:392
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
-msgstr ""
+msgstr "Các tiện ích đã được cài đặt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
@@ -371,21 +394,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
-msgstr ""
+msgstr "Tuỳ chỉnh các tiện ích hiện có"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
+msgstr "Tiện ích đã bị vô hiệu hoá"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr ""
+msgstr "Quá trình khởi chạy tiện ích %s thất bại với các thông tin sau"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:420
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -393,29 +420,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:428
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:430
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:432
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "Danh mục plugins đã cài đặt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:436
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -423,12 +450,83 @@ msgstr ""
 msgid "Communicate with Android phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:39
 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:70
+msgid "Communicate with S60 phones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+"Phát hiện thiết bị do Apple sản xuất, khởi chạy iTunes, xin đợi trong giây "
+"lát ..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
+msgid "finished"
+msgstr "đã hoàn tất"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
+msgid ""
+"Some books not found in iTunes database.\n"
+"Delete using the iBooks app.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+"Không tìm thấy một số sách trong cơ sở dữ liệu của iTunes. \n"
+"Xoá thông qua ứng dụng iBoooks.\n"
+"Nhấn vào \"Xem chi tiết\" để hiển thị danh sách."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
+msgid "settings for device drivers"
+msgstr "thiết lập cho trình điều khiển của thiết bị"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+msgid "Ordered list of formats the device will accept"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+"Một số ảnh bìa sẽ không được chuyển đổi định dạng.\n"
+"Nhấn vào \"Xem chi tiết\" để xem danh sách."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Tin tức"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
@@ -451,6 +549,10 @@ msgstr ""
 msgid "Communicate with the EB600 eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -463,23 +565,55 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
+#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
+msgid "Device Interface"
+msgstr "Giao diện thiết bị"
+
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:95
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:114
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
+msgid "Communicate with The Book reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
+msgid "Communicate with the SpringDesign Alex eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
 msgid "Communicate with the Elonex EB 511 eBook reader."
 msgstr ""
 
@@ -489,13 +623,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
-msgid "Device Interface"
-msgstr ""
+msgstr "John Schember"
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
@@ -513,18 +643,30 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
+msgid "Communicate with the Kobo Reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
+msgid "Communicate with the Palm Pre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
+msgid "Communicate with the Booq Avant"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
@@ -549,52 +691,20 @@ msgstr ""
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:102
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:105
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:108
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
-msgstr "Đọc danh mục sách từ thiết bị"
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
+msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:141
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Chuyển sách sang thiết bị"
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:179
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:186
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Xóa bỏ sách khỏi thiết bị"
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:212
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Gởi dữ liệu nhúng sang thiết bị"
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:218
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Không tên"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
@@ -604,108 +714,125 @@ msgstr ""
 msgid "Communicate with the Teclast K3 reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:252
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
+msgid "Communicate with the Newsmy reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
+msgid "Communicate with the iPapyrus reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:425
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:490
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:583
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:595
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:603
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:740
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:811
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:839
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:589
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:995
-msgid "News"
-msgstr "Tin tức"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Cấu hình thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
 msgid "Place files in sub directories if the device supports them"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Đọc dữ liệu nhúng từ thiết bị"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Đọc thông tin thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+msgid "Getting list of books on device..."
+msgstr "Đọc danh mục sách từ thiết bị"
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+msgid "Transferring books to device..."
+msgstr "Chuyển sách sang thiết bị"
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
+msgid "Removing books from device..."
+msgstr "Xóa bỏ sách khỏi thiết bị"
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
+msgid "Sending metadata to device..."
+msgstr "Gởi dữ liệu nhúng sang thiết bị"
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr ""
@@ -873,8 +1000,8 @@ msgstr ""
 msgid "Do not convert the image to grayscale (black and white)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:445
-#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:456
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:452
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:463
 msgid "Page"
 msgstr "Trang"
 
@@ -951,18 +1078,18 @@ msgstr ""
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
 "conversion process a bug is occurring."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:110
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111
 msgid ""
 "Specify the input profile. The input profile gives the conversion system "
 "information on how to interpret various information in the input document. "
@@ -970,7 +1097,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122
 msgid ""
 "Specify the output profile. The output profile tells the conversion system "
 "how to optimize the created document for the specified device. In some "
@@ -978,7 +1105,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133
 msgid ""
 "The base font size in pts. All font sizes in the produced book will be "
 "rescaled based on this size. By choosing a larger size you can make the "
@@ -986,7 +1113,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:142
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
 "Mapping from CSS font names to font sizes in pts. An example setting is "
 "12,12,14,16,18,20,22,24. These are the mappings for the sizes xx-small to xx-"
@@ -995,17 +1122,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:154
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
 msgid ""
 "The line height in pts. Controls spacing between consecutive lines of text. "
 "By default no line height manipulation is performed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170
 msgid ""
 "Some badly designed documents use tables to control the layout of text on "
 "the page. When converted these documents often have text that runs off the "
@@ -1013,58 +1140,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:188
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level three. Each entry is added under the previous level two "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:212
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:219
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
 "the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the threshold "
 "number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:234
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235
 msgid ""
 "Remove entries from the Table of Contents whose titles match the specified "
 "regular expression. Matching entries and all their children are removed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:245
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or <h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
@@ -1074,7 +1201,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:259
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -1082,112 +1209,114 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:269
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will be appended to "
 "the style rules from the source file, so it can be used to override those "
 "rules."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:278
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:284
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285
 msgid ""
 "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290
 msgid ""
 "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:294
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295
 msgid ""
 "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300
 msgid ""
 "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:304
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306
 msgid ""
-"Do not force text to be justified in output. Whether text is actually "
-"displayed justified or not depends on whether the ebook format and reading "
-"device support justification."
+"Change text justification. A value of \"left\" converts all justified text "
+"in the source to left aligned (i.e. unjustified) text. A value of "
+"\"justify\" converts all unjustified text to justified. A value of "
+"\"original\" (the default) does not change justification in the source file. "
+"Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
 "Remove spacing between paragraphs. Also sets an indent on paragraphs of "
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
 msgid ""
 "When calibre removes inter paragraph spacing, it automatically sets a "
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:325
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:331
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:336
 msgid ""
 "Insert a blank line between paragraphs. Will not work if the source file "
 "does not use paragraphs (<p> or <div> tags)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:338
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343
 msgid ""
 "Remove the first image from the input ebook. Useful if the first image in "
 "the source file is a cover and you are specifying an external cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:346
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351
 msgid ""
 "Insert the book metadata at the start of the book. This is useful if your "
 "ebook reader does not support displaying/searching metadata directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:354
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359
 msgid ""
 "Attempt to detect and correct hard line breaks and other problems in the "
 "source file. This may make things worse, so use with care."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:362
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
 msgid "Use a regular expression to try and remove the header."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:369
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
 msgid "The regular expression to use to remove the header."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
 msgid "Use a regular expression to try and remove the footer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
 msgid "The regular expression to use to remove the footer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:389
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
 msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:396
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
 msgid ""
 "Transliterate unicode characters to an ASCII representation. Use with care "
 "because this will replace unicode characters with ASCII. For instance it "
@@ -1197,111 +1326,121 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:411
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:416
+msgid ""
+"Preserve ligatures present in the input document. A ligature is a special "
+"rendering of a pair of characters like ff, fi, fl et cetera. Most readers do "
+"not have support for ligatures in their default fonts, so they are unlikely "
+"to render correctly. By default, calibre will turn a ligature into the "
+"corresponding pair of normal characters. This option will preserve them "
+"instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
 msgid "Set the title."
 msgstr "Gán Tựa đề"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:415
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
 msgid "Set the authors. Multiple authors should be separated by ampersands."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:420
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:424
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
 msgid "Set the ebook description."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:436
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:453
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56
 msgid "Set the ebook publisher."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:440
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:457
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60
 msgid "Set the series this ebook belongs to."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:444
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:448
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
 msgid "Set the rating. Should be a number between 1 and 5."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:452
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:469
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66
 msgid "Set the ISBN of the book."
 msgstr "Gán số ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:456
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:473
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
 msgid "Set the tags for the book. Should be a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:460
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
 msgid "Set the book producer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:464
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:481
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72
 msgid "Set the language."
 msgstr "Gán ngôn ngữ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:468
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:472
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:572
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:630
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:637
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:781
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:808
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:895
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
 "The contents of the directory are first deleted, so be careful."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
 "Turn off splitting at page breaks. Normally, input files are automatically "
 "split at every page break into two files. This gives an output ebook that "
@@ -1310,20 +1449,41 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:75
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
 "Split all HTML files larger than this size (in KB). This is necessary as "
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
 "Normally, if the input file has no cover and you don't specify one, a "
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
+msgid ""
+"Do not use SVG for the book cover. Use this option if your EPUB is going to "
+"be used ona  device that does not support SVG, like the iPhone or the "
+"JetBook Lite. Without this option, such devices will display the cover as a "
+"blank page."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
+msgid ""
+"When using an SVG cover, this option will cause the cover to scale to cover "
+"the available screen area, but still preserve its aspect ratio (ratio of "
+"width to height). That means there may be white borders at the sides or top "
+"and bottom of the image, but the image will never be distorted. Without this "
+"option the image may be slightly distorted, but there will be no borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
+msgid "Start"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
@@ -1580,87 +1740,96 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:363
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:411
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1154
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tựa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:416
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1155
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "Tác giả"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:365
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "Nhà xuất bản"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Chủ nhiệm"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:100
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "Bình luận"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1099
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:96
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Thẻ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:95
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Loạt sách"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1098
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "Nhãn thời gian"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "Đã xuất bản"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "Quyền"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1759,35 +1928,39 @@ msgstr ""
 msgid "No cover found"
 msgstr "Không tìm thấy Bìa sáchM"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Tải dữ liệu mô tả sách"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr "Đánh giá"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "Thẻ phân loại"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr "Mô tả/Bình luận"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:136
 msgid "Downloads metadata from Google Books"
 msgstr "Tải dữ liệu mô tả từ Google Books"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:152
 msgid "Downloads metadata from isbndb.com"
 msgstr "Tải dữ liệu mô tả từ isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:181
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:180
 msgid ""
 "To use isbndb.com you must sign up for a %sfree account%s and enter your "
 "access key below."
@@ -1795,10 +1968,14 @@ msgstr ""
 "Để sử dụng isbndb.com bạn phải đăng ký %stài khoản miễn phí%s và nhập mã số "
 "truy cập vào ô bên dưới"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:189
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:188
 msgid "Downloads social metadata from amazon.com"
 msgstr "Tải dữ liệu mô tả chung từ amazon.com"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -1859,7 +2036,7 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1094
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Bìa sách"
@@ -1895,6 +2072,10 @@ msgstr ""
 msgid "All articles"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
+msgid "This is an Amazon Topaz book. It cannot be processed."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr "Trang bìa"
@@ -1902,7 +2083,7 @@ msgstr "Trang bìa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Mục lục"
 
@@ -1962,7 +2143,7 @@ msgstr "Lời nói đầu"
 msgid "Main Text"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
@@ -1970,7 +2151,7 @@ msgstr ""
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
@@ -1979,10 +2160,6 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "Không tên"
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
@@ -2006,7 +2183,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2014,7 +2191,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2149,6 +2326,8 @@ msgid ""
 msgstr "file .pdf...\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Tác giả"
 
@@ -2248,6 +2427,12 @@ msgstr ""
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
+msgid ""
+"Preserve the aspect ratio of the cover, instead of stretching it to fill the "
+"ull first page of the generated pdf."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr ""
@@ -2276,13 +2461,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+msgid ""
+"Normally extra spaces are condensed into a single space. With this option "
+"all spaces will be displayed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2313,191 +2504,778 @@ msgid ""
 "allows max-line-length to be below the minimum"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
-msgid "Sort tags list by popularity"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Number of covers to show in the cover browsing mode"
+msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
-msgid "Defaults for conversion to LRF"
+msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+msgid "tag browser categories not to display"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 msgid "The specified directory could not be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1693
-msgid "No books found"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:341
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:354
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
+msgid "Searching for sub-folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
+msgid "Searching for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
+msgid "Looking for duplicates based on file hash"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
+msgid "Choose root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
+msgid "Invalid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
+msgid "is not a valid root folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
+msgid "Add books to calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
+msgid "WizardPage"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
+msgid "Scanning root folder for books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
+msgid "This may take a few minutes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
+msgid "Choose the location to add books from"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
+msgid "Select a folder on your hard disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
+msgid ""
+"<p>calibre can scan your computer for existing books automatically. These "
+"books will then be <b>copied</b> into the calibre library. This wizard will "
+"help you customize the scanning and import process for your existing book "
+"collection.</p>\n"
+"<p>Choose a root folder. Books will be searched for only inside this folder "
+"and any sub-folders.</p>\n"
+"<p>Make sure that the folder you chose for your calibre library <b>is "
+"not</b> under the root folder you choose.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
+msgid "&Root folder:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
+msgid ""
+"This folder and its sub-folders will be scanned for books to import into "
+"calibre's library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
+msgid "..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:67
+msgid "Handle multiple files per book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
+msgid ""
+"&One book per folder, assumes every ebook file in a folder is the same book "
+"in a different format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
+msgid ""
+"&Multiple books per folder, assumes every ebook file is a different book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
@@ -2533,31 +3311,31 @@ msgstr ""
 msgid "output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2565,7 +3343,7 @@ msgstr ""
 msgid "Form"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
@@ -2574,29 +3352,29 @@ msgid "E-book options"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:282
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:958
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:976
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
 msgid "'Don't include this book' tag:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
 msgid "'Mark this book as read' tag:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
 msgid "Regex pattern describing tags to exclude as genres:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
 msgid ""
 "Regex tips:\n"
 "- The default regex - \\[[\\w ]*\\] - excludes genre tags of the form [tag], "
@@ -2605,15 +3383,15 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
@@ -2741,46 +3519,6 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:508
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:180
-msgid "..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 msgid ""
 "The debug process outputs the intermediate HTML generated at various stages "
@@ -2792,22 +3530,30 @@ msgstr ""
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
+msgid "No default &cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
+msgid "No &SVG cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
+msgid "Preserve cover &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:45
-msgid "No default &cover"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
@@ -2857,22 +3603,22 @@ msgid "&Base font size:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
 msgid "Font size &key:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:118
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127
 msgid " pt"
 msgstr ""
 
@@ -2904,51 +3650,59 @@ msgstr ""
 msgid "Control the look and feel of the output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
-msgid "&Disable font size rescaling"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
+msgid "Original"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
+msgid "Left align"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
+msgid "Justify text"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
+msgid "&Disable font size rescaling"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
 msgid "Wizard to help you choose an appropriate font size key"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
 msgid ""
 "<p>When calibre removes inter paragraph spacing, it automatically sets a "
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
-msgid "Insert &blank line"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
-msgid "No text &justification"
+msgid "Text justification:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
@@ -2956,11 +3710,19 @@ msgid "&Linearize tables"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
-msgid "&Transliterate unicode characters to ASCII."
+msgid "Extra &CSS"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
-msgid "Extra &CSS"
+msgid "&Transliterate unicode characters to ASCII"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
+msgid "Insert &blank line"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
+msgid "Keep &ligatures"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
@@ -3017,7 +3779,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195
 msgid "Metadata"
 msgstr ""
 
@@ -3028,117 +3790,117 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:101
 msgid "Choose cover for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:108
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126
 msgid " is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
 msgid "Book Cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 msgid "&Title: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
 msgid "Change the title of this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "&Author(s): "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
 msgid "&Publisher: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
 msgid "&Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "List of known series. You can add new series."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
 msgid "Book "
 msgstr ""
 
@@ -3186,35 +3948,35 @@ msgstr ""
 msgid "Page Setup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
@@ -3223,12 +3985,12 @@ msgid "PDB Input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 msgid "Treat each &line as a paragraph"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Assume print formatting"
 msgstr ""
 
@@ -3256,39 +4018,34 @@ msgstr ""
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
+msgid "Preserve &aspect ratio of cover"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "Choose the format to view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "No formats available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:107
-msgid "~"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
@@ -3357,12 +4114,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -3446,21 +4203,25 @@ msgstr ""
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Process using markdown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
 msgid ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
 msgid "Do not insert Table of Contents into output text when using markdown"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
+msgid "Preserve &spaces"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
 msgstr ""
@@ -3566,247 +4327,324 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242
+msgid "Undefined"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
+msgid "Yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
+msgid "No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:331
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:333
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:350
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
+msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:585
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:629
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:636
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:789
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:368
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:92
-msgid "Path"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:112
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Formats"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
@@ -3853,11 +4691,11 @@ msgstr ""
 msgid "Choose Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
 msgstr ""
 
@@ -3873,199 +4711,241 @@ msgstr ""
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
+msgid "Edit Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:173
 msgid "%(plugin_type)s %(plugins)s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:224
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:222
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:299
 msgid "new email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:478
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1530
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
+msgid "System port selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
+msgid ""
+"The value <b>%d</b> you have chosen for the content server port is a system "
+"port. Your operating system <b>may</b> not allow the server to run on this "
+"port. To be safe choose a port number larger than 1024."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:484
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:642
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+msgid "Do you really want to delete column %s and all its data?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:649
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:692
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:701
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:709
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:764
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
+msgid ""
+"The changes you made require that Calibre be restarted. Please restart as "
+"soon as practical."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:829
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4176,259 +5056,288 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:505
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+msgid "Show &splash screen at startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+msgid "Max. OPDS &ungrouped items:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4439,33 +5348,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr ""
 
@@ -4493,16 +5402,6 @@ msgstr ""
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
@@ -4512,8 +5411,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
 
@@ -4529,6 +5431,128 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
+msgid "Comma separated text, like tags, shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
+msgid "Long text, like comments, not shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
+msgid ""
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
+msgid ""
+"The lookup name must be lower case and cannot contain \":\"s or spaces"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:117
+msgid "Create or edit custom columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
+msgid "&Lookup name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
+msgid "Column &heading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:104
+msgid ""
+"Used for searching the column. Must contain only digits and lower case "
+"letters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
+msgid ""
+"Column heading in the library view and category name in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
+msgid "Column &type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
+msgid "What kind of information will be kept in the column."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
+msgid ""
+"<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's "
+"for year.</p>\n"
+"<p>For example:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy gives 05 January 10</li>\n"
+"</ul> "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
+msgid "Use MMM yyyy for month + year, yyyy for year only"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
+msgid "Default: dd MMM yyyy."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
+msgid "Format for &dates"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
 msgstr ""
@@ -4570,18 +5594,35 @@ msgstr ""
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
@@ -4619,11 +5660,11 @@ msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
 msgid ""
 "<p>calibre can find metadata for your books from two locations: <b>Google "
 "Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
@@ -4631,28 +5672,28 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
 msgid ""
 "Select the book that most closely matches your copy from the list below"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
 msgid "Download &social metadata (tags/rating/etc.) for the selected book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
 msgid "Overwrite author and title with author and title of selected book"
 msgstr ""
 
@@ -4676,79 +5717,78 @@ msgstr ""
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:24
+msgid "Editing meta information for <b>%d books</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
-msgid "Meta information"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
 msgid ""
 "Selected books will be automatically numbered,\n"
 "in the order you selected them.\n"
@@ -4756,195 +5796,223 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
+msgid ""
+"Remove stored conversion settings for the selected books.\n"
+"\n"
+"Future conversion of these books will use the default settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
+msgid "Remove &stored conversion settings for the selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412
+msgid "&Basic metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
+msgid "&Custom metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
 msgid "Not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
 msgid "Choose formats for "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1276
-msgid "Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:168
 msgid "You do not have permission to read the following files:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:189
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:207
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:208
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:247
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:257
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
 msgid "Abort the editing of all remaining books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:527
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Edit Meta Information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+msgid "Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
 msgid "IS&BN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
 msgid "Publishe&d:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "dd MMM yyyy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
 msgid "&Date:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
 msgid "&Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
 msgid "&Fetch metadata from server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
 msgid "Available Formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
 msgid "Add a new format for this book to the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
 msgid "Remove the selected formats for this book from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Set the cover for the book from the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
 msgid "Update metadata from the metadata in the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
 msgid "Reset cover to default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411
 msgid "Download &cover"
 msgstr ""
 
@@ -4956,6 +6024,39 @@ msgstr ""
 msgid "Aborting..."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54
+msgid ""
+"The current saved search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
 msgstr ""
@@ -4981,7 +6082,7 @@ msgid "Last downloaded"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
 msgstr ""
 
@@ -4989,123 +6090,127 @@ msgstr ""
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
+msgid "Download all scheduled new sources"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:314
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
 msgid "Every "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -5186,11 +6291,79 @@ msgstr ""
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
+msgid " (not on any book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
+msgid ""
+"The current tag category will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
+msgid "User Categories Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
+msgid "A&vailable items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
+msgid "Apply tags to current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
+msgid "A&pplied items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
+msgid "Unapply (remove) tag from current tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
+msgid "Category name: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
+msgid "Select a category to edit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
+msgid "Delete this selected tag category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
+msgid "Enter a new category name. Select the kind before adding it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
+msgid "Add the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
+msgid "Category filter: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
+msgid "Select the content kind of the new category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:93
 msgid "Are your sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
 msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
@@ -5236,15 +6409,75 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:50
-msgid "Test email settings"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
+msgid "Item is blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
+msgid "Item already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
+msgid "The item %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
+msgid "No item selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:80
+msgid "You must select one item from the list of Available items."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
+msgid "No items selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:90
+msgid "You must select at least one items from the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:94
+msgid "Are you certain you want to delete the following items?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Category Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+msgid "Rename the item in every book where it is used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
+msgid "Ctrl+S"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
-msgid "Send test mail from %s to:"
+msgid "Test email settings"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
+msgid "Send test mail from %s to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
 msgid "&Test"
 msgstr ""
@@ -5474,11 +6707,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr ""
 
@@ -5514,98 +6747,303 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "N"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "Y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:440
-msgid "None"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:894
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
+msgid "Size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1095
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1146
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
@@ -5631,7 +7069,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:440
 msgid "No matches found"
 msgstr ""
 
@@ -5648,20 +7086,22 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:476
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:477
 msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:188
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189
 msgid "Forward"
 msgstr ""
 
@@ -5670,7 +7110,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196
 msgid "Open ebook"
 msgstr ""
 
@@ -5678,206 +7118,269 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:86
-msgid "If you are sure it is not running"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
+msgid "Calibre Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
-msgid "Cannot Start "
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
-msgid "%s is already running."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
-msgid "may be running in the system tray, in the"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
+msgid "Choose a location for your new calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
+msgid "Bad database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
+msgid "Bad database location %r. calibre will now quit."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
+msgid "Corrupted database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+msgid ""
+"Your calibre database appears to be corrupted. Do you want calibre to try "
+"and repair it automatically? If you say No, a new empty calibre library will "
+"be created."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+msgid ""
+"Repairing database. This can take a very long time for a large collection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
+msgid ""
+"Bad database location %r. Will start with  a new, empty calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+msgid "If you are sure it is not running"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+msgid "Cannot Start "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
+msgid "%s is already running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
+msgid "may be running in the system tray, in the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+msgid "M"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:325
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:335
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5887,15 +7390,15 @@ msgid ""
 "on windows where GUI apps do not have a output streams."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
@@ -5907,11 +7410,35 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
@@ -5930,7 +7457,7 @@ msgid " or "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
 msgstr ""
 
@@ -5946,70 +7473,103 @@ msgstr ""
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77
 msgid "Click to change"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
 msgid "Clear"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
-msgid "Jobs:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
-msgid "Click to see list of active jobs."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:196
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
+msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:196
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
+msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
+msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:209
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
+msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
+msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -6049,573 +7609,112 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:67
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:147
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:153
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:176
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:268
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:270
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:272
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:273
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:274
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:275
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:278
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:279
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:282
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:326
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:327
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2043
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:336
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:342
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:344
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:346
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:378
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:398
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:494
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:495
-msgid "Bad database location"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:497
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:563
-msgid "Calibre Library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2198
-msgid "Choose a location for your ebook library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:736
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:797
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:802
-msgid "(%d found)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:893
-msgid "Device: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:895
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:923
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:935
-msgid "Device database corrupted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:936
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:995
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:996
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1173
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1541
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1579
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1605
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1670
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1788
-msgid "No books selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1004
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1029
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1057
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1063
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1082
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1091
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1096
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1216
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1217
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1265
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1316
-msgid "Uploading books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1277
-msgid "EPUB Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1278
-msgid "LRF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1279
-msgid "HTML Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1280
-msgid "LIT Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1281
-msgid "MOBI Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1282
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1283
-msgid "Text books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1284
-msgid "PDF Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
-msgid "Comics"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
-msgid "Archives"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1290
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1325
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1326
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1335
-msgid "Failed to read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1336
-msgid "Failed to read metadata from the following"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1356
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1932
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1948
-msgid "No book selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1369
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1425
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1452
-msgid "Deleting books from device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1483
-msgid "Cannot download metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1499
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1501
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1501
-msgid "metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1503
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1525
-msgid "Failed to download some metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
-msgid "Failed to download metadata for the following:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1529
-msgid "Failed to download metadata:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1578
-msgid "Cannot edit metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-msgid "Cannot save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1607
-msgid "Choose destination directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1641
-msgid "There was an error while saving."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1648
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Could not save some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-msgid "Click the show details button to see which ones."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1671
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1688
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1694
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1704
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1707
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1708
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Fetching news from "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1736
-msgid " fetched."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1787
-msgid "Cannot convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1816
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1932
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1985
-msgid "Cannot view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1947
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1969
-msgid "Multiple Books Selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1970
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
-msgid "%s has no available formats."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2027
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2028
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2072
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2126
-msgid "Error talking to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2127
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2150
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2178
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2164
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2179
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2207
-msgid "Invalid library location"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2208
-msgid "Could not access %s. Using %s as the library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2361
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2369
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2370
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -6773,70 +7872,99 @@ msgstr ""
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:671
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:675
 msgid "Remember last used window size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:81
 msgid ""
 "Set the user CSS stylesheet. This can be used to customize the look of all "
 "books."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138
+msgid "Go to..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
+msgid "Next Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
+msgid "Previous Section"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
+msgid "Document Start"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
+msgid "Document End"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
+msgid "Section Start"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
+msgid "Section End"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
@@ -6889,10 +8017,6 @@ msgstr ""
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138
-msgid "Go to..."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
@@ -6901,258 +8025,294 @@ msgstr ""
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:672
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:178
-msgid "Ebook Viewer"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:179
-msgid "Close dictionary"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:181
-msgid "toolBar"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
-msgid "Next page"
+msgid "E-book Viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
-msgid "Previous page"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
-msgid "Font size larger"
+msgid "Close dictionary"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
-msgid "Font size smaller"
+msgid "toolBar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
+msgid "Next page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
-msgid "Find next"
+msgid "Previous page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
-msgid "Copy to clipboard"
+msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
-msgid "Reference Mode"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195
-msgid "Bookmark"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196
-msgid "Toggle full screen"
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
+msgid "Font size smaller"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
+msgid "Find next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
+msgid "Find next occurrence"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
+msgid "F3"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
+msgid "Copy to clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
+msgid "Reference Mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
+msgid "Bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
+msgid "Toggle full screen"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
+msgid "Find previous"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
+msgid "Find previous occurrence"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
+msgid "Shift+F3"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
 "your calibre book collection directly on the device. To do this you have to "
 "turn on the content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
 msgid ""
 "Remember to leave calibre running as the server only runs as long as calibre "
 "is running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
 msgid ""
 "You have to add the URL http://myhostname:8080 as your calibre library in "
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:522
 msgid ""
 "<p>An invalid library already exists at %s, delete it before trying to move "
 "the existing library.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
@@ -7187,13 +8347,6 @@ msgstr ""
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
 msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
@@ -7376,38 +8529,49 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
+msgid "empty"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
@@ -7427,14 +8591,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:262
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
 msgid ""
 "Title of generated catalog used as title in metadata.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:269
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
@@ -7443,14 +8607,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:279
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
 msgid ""
 "Regex describing tags to exclude as genres.\n"
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:285
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
 msgid ""
 "Comma-separated list of tag words indicating book should be excluded from "
 "output.  Case-insensitive.\n"
@@ -7459,28 +8623,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:293
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
 msgid ""
 "Include 'Titles' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:300
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
 msgid ""
 "Include 'Recently Added' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:307
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
 msgid ""
 "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:314
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
 "Sort titles with leading numbers as text, e.g.,\n"
 "'2001: A Space Odyssey' sorts as \n"
@@ -7489,7 +8653,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:321
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
 msgid ""
 "Specifies the output profile.  In some cases, an output profile is required "
 "to optimize the catalog for the device.  For example, 'kindle' or "
@@ -7499,27 +8663,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:328
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
 msgid ""
 "Tag indicating book has been read.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:122
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:41
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
 "List the books available in the calibre database.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:128
 msgid ""
 "The fields to display when listing books in the database. Should be a comma "
 "separated list of fields.\n"
@@ -7528,61 +8692,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:230
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:135
 msgid ""
 "The field by which to sort the results.\n"
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:234
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:139
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:236
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:237
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:238
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:342
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
 "The following books were not added as they already exist in the database "
 "(see --duplicates option):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:365
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:267
 msgid ""
 "%prog add [options] file1 file2 file3 ...\n"
 "\n"
@@ -7591,27 +8749,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:374
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:276
 msgid ""
 "Assume that each directory has only a single logical book and that all files "
 "in it are different e-book formats of that book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:388
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:282
+msgid "Add an empty book (a book with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:284
+msgid "Set the title of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:286
+msgid "Set the authors of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:288
+msgid "Set the ISBN of the added empty book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:404
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7620,11 +8794,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:419
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:438
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
 "%prog add_format [options] id ebook_file\n"
 "\n"
@@ -7633,15 +8807,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:453
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
 msgid "You must specify an id and an ebook file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:458
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:466
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:391
 msgid ""
 "\n"
 "%prog remove_format [options] id fmt\n"
@@ -7651,11 +8825,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:483
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:408
 msgid "You must specify an id and a format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:501
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7665,15 +8839,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:509
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:518
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:531
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
 msgid ""
 "\n"
 "%prog set_metadata [options] id /path/to/metadata.opf\n"
@@ -7686,11 +8860,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:472
 msgid "You must specify an id and a metadata file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:567
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -7701,27 +8875,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:575
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid "Export all books in database, ignoring the list of ids."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:577
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
 msgid "Export books to the specified directory. Default is"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:579
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:504
 msgid "Export all books into a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:586
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:511
 msgid "Specifying this switch will turn this behavior off."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:609
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:534
 msgid "You must specify some ids or the %s option"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:622
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
 msgid ""
 "%prog add_custom_column [options] label name datatype\n"
 "\n"
@@ -7732,23 +8906,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:635
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:560
 msgid ""
 "A dictionary of options to customize how the data in this column will be "
 "interpreted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:648
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:706
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
 "\n"
 "    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n"
@@ -7759,30 +8933,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:720
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
 msgid ""
 "Comma-separated list of database IDs to catalog.\n"
 "If declared, --search is ignored.\n"
 "Default: all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:724
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:649
 msgid ""
 "Filter the results by the search query. For the format of the search query, "
 "please see the search-related documentation in the User Manual.\n"
 "Default: no filtering"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:730
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:655
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:743
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:763
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:688
 msgid ""
 "\n"
 "    %prog set_custom [options] column id value\n"
@@ -7794,17 +8968,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:774
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:699
 msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:785
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:710
 msgid "Error: You must specify a field name, id and value"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:804
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -7813,15 +8987,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:811
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:736
 msgid "Show details for each column."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:823
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:748
 msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:831
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
+msgid "y"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:756
 msgid ""
 "\n"
 "    %prog remove_custom_column [options] label\n"
@@ -7831,15 +9009,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:839
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:764
 msgid "Do not ask for confirmation"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:849
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:774
 msgid "Error: You must specify a column label"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:862
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -7851,30 +9029,50 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1258
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1287
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1304
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1397
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1434
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1456
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+msgid "Ratings"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
@@ -7898,62 +9096,64 @@ msgid "The series"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30
-msgid "The series number. To get leading zeros use {series_index:0>3s}"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:31
-msgid "The rating"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:32
-msgid "The ISBN"
+msgid ""
+"The series number. To get leading zeros use {series_index:0>3s} or "
+"{series_index:>3s} for leading spaces"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
-msgid "The publisher"
+msgid "The rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
-msgid "The date"
+msgid "The ISBN"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
-msgid "The published date"
+msgid "The publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
+msgid "The date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
+msgid "The published date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:46
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:52
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54
 msgid ""
 "Normally, calibre will update the metadata in the saved files from what is "
 "in the calibre library. Makes saving to disk slower."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:55
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57
 msgid ""
 "Normally, calibre will write the metadata into a separate OPF file along "
 "with the actual e-book files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:58
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:60
 msgid ""
 "Normally, calibre will save the cover in a separate file along with the "
 "actual e-book file(s)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:61
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:63
 msgid ""
 "Comma separated list of formats to save for each book. By default all "
 "available books are saved."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:64
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:66
 msgid ""
 "The template to control the filename and directory structure of the saved "
 "files. Default is \"%s\" which will save books into a per-author "
@@ -7961,7 +9161,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:69
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
 msgid ""
 "The template to control the filename and directory structure of files sent "
 "to the device. Default is \"%s\" which will save books into a per-author "
@@ -7969,7 +9169,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:76
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78
 msgid ""
 "Normally, calibre will convert all non English characters into English "
 "equivalents for the file names. WARNING: If you turn this off, you may "
@@ -7977,43 +9177,124 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:82
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:84
 msgid ""
 "The format in which to display dates. %d - day, %b - month, %Y - year. "
 "Default is: %b, %Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:85
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:256
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:379
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39
+msgid ""
+"The maximum number of matches to return per OPDS query. This affects Stanza, "
+"WordPlayer, etc. integration."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:888
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
 msgid "Path to the library folder to serve with the content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:890
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
 msgid "Write process PID to the specified file"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Newest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
@@ -8028,58 +9309,62 @@ msgid ""
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:650
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:652
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:656
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:658
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:660
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:662
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:682
 msgid "The default output format for ebook conversions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:666
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:686
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:668
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
 msgid "The priority of worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:692
 msgid "Swap author first and last names when reading metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:700
+msgid "User-created tag browser categories"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
 msgstr ""
@@ -8149,26 +9434,38 @@ msgid "English (Pakistan)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
+msgid "English (Israel)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
+msgid "English (Singapore)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
+msgid "English (Yemen)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "German (AT)"
+msgid "English (Ireland)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Dutch (NL)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+msgid "Spanish (Paraguay)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+msgid "German (AT)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr ""
 
@@ -8192,13 +9489,13 @@ msgstr ""
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:142
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:165
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
 msgid "Untitled article"
 msgstr ""
 
@@ -8225,97 +9522,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1228
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1239
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1256
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1403
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1419
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -8323,68 +9620,70 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
-msgstr ""
+msgstr "Bạn"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:181
 msgid "Scheduled"
-msgstr ""
+msgstr "Đã đươc lên lịch"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:182
 msgid "Custom"
-msgstr ""
+msgstr "Tùy biến"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
-msgstr ""
+msgstr "%prog URL"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
-msgstr ""
+msgstr "Thư mục cơ bản dùng để lưu đường dẫn. Mặc định là %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
+"Số tập tin tải về tối đa, chỉ áp dụng với các tập tin được gắn nhãn <a "
+"href>. Mặc định là %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -8393,6 +9692,6 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr ""
diff --git a/src/calibre/translations/zh_CN.po b/src/calibre/translations/zh_CN.po
index f6e3f3210d..2a1c2096b8 100644
--- a/src/calibre/translations/zh_CN.po
+++ b/src/calibre/translations/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:46+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:02+0000\n"
 "Last-Translator: Thruth Wang <wanglihao@gmail.com>\n"
 "Language-Team: Simplified Chinese <wanglihao@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
@@ -25,12 +25,12 @@ msgstr "不做任何处理"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -42,22 +42,22 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -103,44 +103,46 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -279,62 +281,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "该配置文件适用索尼 PRS 300。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "该配置文件适用索尼 PRS-900。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "该配置文件适用 Microsoft Reader。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "该配置文件适用 Mobipocket 书籍。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "该配置文件适用翰林 V3 和类似设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "该配置文件适用翰林 V5 和类似设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "该配置文件适用 Cybook G3 设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "该配置文件适用 Cybook Opus 设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "该配置文件适用 Amazon Kindle。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "该配置文件适用 Irex Illiad 设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "该配置文件适用 IRex Digital Reader 1000 设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "该配置文件适用 IRex Digital Reader 800。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "该配置文件适用 B&N Nook。"
 
@@ -358,21 +360,21 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr "该配置文件适用 Kobo Reader。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "该配置文件适用索尼 PRS-300。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "该配置文件适用 5 英寸 JetBook 设备。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr "该配置文件适用 SONY PRS 产品线，如 500/505/700 型号等，使用横向页面，主要适用于漫画。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "该配置文件适用 Amazon Kindle DX。"
 
@@ -392,15 +394,19 @@ msgstr "本地插件定制"
 msgid "Disabled plugins"
 msgstr "禁用插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "无有效插件位于 "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "插件 %s 初始化返回失败回溯："
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -412,29 +418,29 @@ msgstr ""
 "    通过加载外部插件定制 Calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "添加插件，指定包含其 zip 文件的路径。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "按名称移除自定义插件（对内置插件无效）。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "定制插件，指定插件名和自定制字符串，使用逗号分隔。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "列出全部已装插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "启用该名称插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "禁用该名称插件"
 
@@ -448,59 +454,70 @@ msgid ""
 "first one that exists will be used"
 msgstr "逗号间隔的电子书发送到设备的目录列表。将使用第一个存在的目录。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr "与 S60 手机通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "设备磁盘盘符设置"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "设备支持的格式列表"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "新闻"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "与 Binatone Readme eBook reader 通信。"
@@ -523,6 +540,10 @@ msgstr "与  通信。"
 msgid "Communicate with the EB600 eBook reader."
 msgstr "与 EB600 eBook reader 通信。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
@@ -535,6 +556,10 @@ msgstr "与 Entourage Edge 通信。"
 msgid "Communicate with the ESlick eBook reader."
 msgstr "与 ESlick eBook reader 通信。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -549,14 +574,20 @@ msgstr "设备界面"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "与翰林 V3 电子书通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "与翰林 V5 电子书通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "与 BOOX eBook reader 通信。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "与 Hanvon N520 eBook reader 通信。"
@@ -583,7 +614,7 @@ msgstr "与 IRex Iliad eBook reader 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -603,15 +634,15 @@ msgstr "与 Iriver Story 阅读器通信。"
 msgid "Communicate with the JetBook eBook reader."
 msgstr "与 JetBook eBook reader 通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "与 Kindle eBook reader 通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "与 Kindle 2 eBook reader 通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "与 Kindle DX 通信。"
 
@@ -655,13 +686,13 @@ msgstr "与 Sony PRS-500 eBook reader 通信。"
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr "逗号间隔的元数据域列表，用以在设备形成合集。可能性包括： "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "未命名"
@@ -682,61 +713,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "无法检测到 %s 磁盘，请重启后重试。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "无法检测 %s 挂载点。请尝试重启。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "无检测测到 %s 磁盘。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr "无法找到帮助程序：%s。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "无法检测到 %s 磁盘驱动器。您的内核可能正在输出已经废弃的 SYSFS 版本。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "无法装载主存储器（错误代码：%d）"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "设备中未插入存储卡."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "选定的插槽：%s 未被支持。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "设备内置存储空间不足"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "存储卡空间不足"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "新闻"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "配置设备"
@@ -746,57 +766,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "如果设备支持，将文件放置在子文件夹中"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "从设备上的文件中读取元数据"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "控制书籍保存方式的模板"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "额外定制"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "与电子书阅读设备通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "获取设备信息..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "从设备中获取书籍列表..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "传输书籍到设备中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "将书籍添加到设备的元数据列表中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "正在从设备中删除书籍..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "将书籍从设备的元数据列表移除中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "正在传输元数据到设备..."
 
@@ -1423,15 +1447,15 @@ msgstr "序列索引和评分必须为数字。忽略"
 msgid "Failed to parse date/time"
 msgstr "解析日期/时间失败"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "将输入转换为HTML中..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "正在对电子书籍进行转换..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "正在创建"
 
@@ -1758,84 +1782,88 @@ msgstr "将被内嵌的等宽字体集"
 msgid "Comic"
 msgstr "漫画"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "标题"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "出版商"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "出品人"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "注释"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "标签"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "语言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "时间戳"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "发布于"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "权限"
 
@@ -1843,7 +1871,7 @@ msgstr "权限"
 msgid "EDITORIAL REVIEW"
 msgstr "编辑评论"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1952,6 +1980,10 @@ msgstr "存储封面到"
 msgid "No cover found"
 msgstr "没有找到封面"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "元数据下载"
@@ -1990,6 +2022,10 @@ msgstr "您需在 isbndb.com 注册%s免费帐户%s并在之下填写您的访
 msgid "Downloads social metadata from amazon.com"
 msgstr "从 amazon.com 下载社会性元数据"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2059,7 +2095,7 @@ msgstr ""
 "\n"
 "通过书籍的ISBN从LibraryThing.com获得书籍的封面图片\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "封面"
@@ -2366,6 +2402,8 @@ msgstr ""
 "获取 PDF 文件信息。\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "作者"
 
@@ -2598,8 +2636,8 @@ msgid "Use Roman numerals for series number"
 msgstr "使用罗马数字作为序列数字"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "按欢迎度排序标签"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2675,23 +2713,418 @@ msgstr "将并发任务最大值限制为 CPU 数量"
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "已复制"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "复制"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "复制到剪贴板"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "选择文件"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "仅使用书库"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "仅使用主书库生成注释"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "未选择书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "未选定书籍抓取注释"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "将用户注释合并到数据库"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />最后已读页：%d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />最后已读页：位置 %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>位置 %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>页数 %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>位置 %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "多少空白书籍？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "应添加多少空白书籍？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "正在上传书籍到设备。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr "Topaz 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "文本书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF 书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "漫画"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "归档"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "支持的书j"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr "合并一些书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr "找到一些重复内容，并入如下已有书籍："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "无法读取元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "无法从下列项目读取元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "未选择书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "无法删除"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "选择删除格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "选择<b>非</b>删除格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "从设备删除书籍。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr "选定书籍将被<b>永久删除</b>，文件会从您的电脑中移除。是否确定？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "无法下载元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "社会性元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "正在为 %s 本书下载 %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "下载一些元数据失败"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "下载下列书籍元数据失败："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "下载元数据失败。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "错误"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "无法编辑元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr "无法合并书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr "合并需要选定至少两本书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr "您将要合并多余 5 本书。<b>是否</b>确定？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "无法保存到磁盘"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "选择目标目录"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "保存出错"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "保存时出错。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "无法保存一些书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "点击显示详情按钮查看具体哪些。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "未选定书籍生成类目"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "正在生成 %s 类目..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "未找到书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"没有书籍收入类目\n"
+"检查不含标签"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "已经生成类目。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "输出类目目录"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "选定目标位置 %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "正在抓取新闻，来源于 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " 已抓取。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "无法转换"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "开始转换 %d 本书"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "无法查看"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "选择格式进行查看"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "选定多本书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr "您正在试图打开 %d 本书籍。同时打开太多书籍可能会变慢，并对电脑响应速度有消极影响。一旦开始，需等待进程完成。是否继续？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "无法打开文件夹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s 无可用格式。"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "搜索"
@@ -2713,15 +3146,10 @@ msgid "The specified directory could not be processed."
 msgstr "无法处理指定目录。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "没有书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "未找到书籍"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "已添加"
@@ -2840,17 +3268,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2869,17 +3297,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2901,6 +3329,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "路径"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "无"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML 选项"
@@ -2960,7 +3440,7 @@ msgstr "输出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2978,8 +3458,8 @@ msgstr "电子书选项"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "类目"
 
@@ -3659,11 +4139,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "RB 输出"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "选择格式进行查看"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr "缺少书籍，无法使用图形界面构建器构建正则表达式。"
@@ -3746,12 +4221,12 @@ msgid "Footer regular expression:"
 msgstr "页脚正则表达式："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "无效正则表达式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "无效正则表达式：%s"
 
@@ -3967,11 +4442,19 @@ msgstr ""
 "高级用法参见 <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath "
 "教程</a>。"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "用封面浏览"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -3992,279 +4475,291 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "无详情可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "设备未连接。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "获取设备信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "获取设备书籍列表"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr "从设备抓取注释"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "传输元数据到设备上"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "上传 %d 本书到设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "从设备上删除书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "从设备上下载书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "查看设备上的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "设置传送到设备的默认动作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "发送邮件至"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "传送到主内存"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "发送到存储卡 A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "发送到存储卡 B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "抓取注释（实验功能）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "与设备通信发生错误"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "设备通讯错误。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr "与设备通讯出现临时性错误。请拔下再重新连接设备，或可能需要重启。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "设备： "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " 被检测到。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "已连接 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "选择传送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "选择传送到设备的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "无设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "无法传送：无连接设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "无卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "无法传送：设备中无储存卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "电子书："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "已添加, 您可以从中获取电子书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "由"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "使用 %s 格式."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "正在发送邮件至"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "无合适格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr "在发送电子邮件之前自动转换下列书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "由于无法找到合适的文件格式无法通过电子邮件发送下列书籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "发送电子书籍失败"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "无法通过电子邮件发送以下书籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "已通过邮件发送:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "新闻:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr "附加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "将新闻发送到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "上传到设备之前自动转换如下书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "正在发送类目到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "将新闻传送到设备."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "传送书籍到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr "无法上传下列书籍到设备，未找到何时格式。请先将书籍转换为设备支持的格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "设备存储空间不足"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>由于设备存储空间不足无法将书籍传送到设备上 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "为此设备选择可用格式和格式顺序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "使用子目录"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "保存模板(&T)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "路径"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "格式"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "封面适配视图(&C)"
@@ -4413,165 +4908,165 @@ msgstr "如选中, 下载的新闻奖自动被发送到 <br>该邮件地址 (使
 msgid "new email address"
 msgstr "新邮件地址"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr "系统端口选定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "错误"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "安装命令行工具失败。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "命令行工具已安装"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "命令行工具安装于"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移动 calibre.app，您必须重新安装命令行工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "不合法的插件路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是合法的插件路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "选择插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "该插件不能被禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "插件: %s 不能被禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "无法个性化插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "插件: %s 无需个性化设置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "定制"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除内置插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 无法移除. 该插件是内置插件. 您可以尝试禁用它而非移除."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "您确定吗？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "错误日志:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "访问日志:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "无法启动内容服务器"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "选择书籍位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "无效的尺寸"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸大小 %s 不合法. 合法的格式为 宽度x高度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "不合法的数据库路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "不合法的数据库路径 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>必须是文件目录."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "不合法的数据库路径.<br>无法写入到 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "检查数据库完整性"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "检查数据库完整性失败"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "找到部分不一致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4682,279 +5177,288 @@ msgstr "在此控制 calibre 发送到设备时的存储方式。首选项 -> 
 msgid "Sending to &device"
 msgstr "发送到设备(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "首选项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "电子书位置(&L)（电子书籍按作者排序存储在文件目录中，元数据存储在 metadata.db）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "选择新的数据库路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "新版程序可用时提示(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "默认下载社会性元数据（标签、评分等）(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "默认抓取元数据覆盖作者和标题(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "默认网络超时(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr "设置网络访问的默认超时限制 (例如在从互联网获取信息时的超时)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "选择界面语言, 需重启(&l):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "普通"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "进程优先级(&p):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "首选输出格式(&O)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "首选输入格式顺序(&I)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "使用罗马数字作为序列数(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "显示系统托盘图标, 需重启生效(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "在系统托盘除显示和提醒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在单独的窗口显示封面浏览界面, 需重启生效(&b)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "即时搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自动将下载的新闻传输到电子书阅读器上(&n)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "在将新闻传送到设备上后从书库中删除(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "浏览模式下显示的书籍封面数量(&N), 须重启生效;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "工具栏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "工具栏按钮大小(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "在工具栏显示按钮文字(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "选择在书库界面中显示的新系列(&c)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "使用内部浏览器显示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "将电子邮件地址添加到书籍发送目的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "添加邮件地址(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "设为默认(&d)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "删除邮件地址(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr "calibre 可以将您的书籍用电子邮件发送给你（或您的读者）。电子邮件将自动向所有钩选自动发送的地址发送下载新闻。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待中的工作进程最大值（需要重启）(&M)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "检查数据库完整性(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "安装命令行工具(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "打开 calibre 配置目录(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "显示最大并发任务数为可用 CPU 核心数(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "调试设备检测(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr "Calibre 带有一个网络服务器程序，您可以由此使用浏览器访问你的书库。对服务器程序配置的修改需要重启服务器程序生效。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "服务器端口(&p):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "用户名(&U):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "密码(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr "如果您使用空密码将导致其他人可以从web界面访问您的书籍库."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "显示书籍封面的最大尺寸(宽度x高度). 过大的封面将会被相应缩小. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "最大封面大小(&c):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "显示密码(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "每次请求最大 OPDS 项(&O)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "启动服务器(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "停止服务器(&o)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "测试服务器(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "在系统启动时自动启动服务器(&a)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "查看服务器日志(&s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4969,33 +5473,33 @@ msgstr ""
 "http://myhostname:8080 作为新类目。此时 myhostname 应该为有效主机名，或者您 Calibre 程序所运行计算机的 IP "
 "地址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "从可以通过配置插件的启用与否来调整Calibre的功能特性."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "启用/禁用插件(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "定制插件(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "移除插件(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "添加插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "插件文件(&F)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "添加(&A)"
 
@@ -5032,10 +5536,11 @@ msgid "Number"
 msgstr "数字"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "日期"
 
@@ -5051,68 +5556,69 @@ msgstr "注释性文字在 create_ct_column.py 添加"
 msgid "Create and edit tag-based columns"
 msgstr "基于标签创建和编辑栏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5223,6 +5729,27 @@ msgstr "一直显示此警告信息(&S)"
 msgid "ERROR"
 msgstr "错误"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "按作者排序"
@@ -5434,11 +5961,6 @@ msgstr "非有效图片"
 msgid "Choose formats for "
 msgstr "选择格式 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "书籍"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "无权限"
@@ -5477,67 +5999,75 @@ msgstr "%s 格式中封面无效"
 msgid "Abort the editing of all remaining books"
 msgstr "放弃编辑所有其余书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "ISBN 编号有效"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "ISBN 编号无效"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "正在下载封面..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "无法抓取封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>无法抓取封面。</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "下载超时。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "无法找到书籍对应的封面。请尝试首先指定 ISBN。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "非法封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "封面不是有效图片"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "出错"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "下载社会性元数据出错"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "无法抓取元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "您必须设定 ISBN，标题，作者或出版商中的至少一个条件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "权限拒绝"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "无法打开 %s。它是否被其它程序占用。"
 
@@ -5896,12 +6426,12 @@ msgid "Choose formats"
 msgstr "选择格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "作者"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "出版商"
 
@@ -6014,12 +6544,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "将标签添加到可用列表并应用到当前书籍"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6051,25 +6581,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6339,11 +6869,11 @@ msgstr "正则表达式 (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "无匹配"
 
@@ -6379,54 +6909,203 @@ msgstr "ISBN："
 msgid "Regular expression (?P<isbn>)"
 msgstr "正则表达式 (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "将单格式存入磁盘"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "逐个修改元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "批量修改元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "下载元数据和封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "仅下载元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "仅下载封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "仅下载社会性元数据"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr "合并到第一本选定书籍 - 删除其它"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr "合并到第一本选定书籍 - 保留其它"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "从单个目录添加书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr "从目录添加书籍，包含子目录（单个目录下有多本书籍，假定每一本电子书文件均为同一本书的不同格式）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr "从目录添加书籍，包含子目录（单个目录下有多本书籍，假定每一本电子书文件均为不同电子书）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "添加空书。（无任何格式）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "保存到磁盘"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "保存到磁盘单个目录"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "仅保存 %s 到磁盘"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "查看"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "查看特定格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "移除选定书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "移除选定书籍中指定格式的书..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "移除所有格式选定书籍，除..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "移除选定书籍封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "分别转换"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "批量转换"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "在您 calibre 书库中创建书籍类目"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "运行欢迎向导"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "类似书籍..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "状态"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "进度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "运行时间"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "有 %d 个正在运行的任务："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "未知任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "有 %d 个正在等待执行的任务："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "无法中止任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "无法在与设备通信时中止任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "任务已执行"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "不可用"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "任务："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "点击查看活动任务。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - 任务"
 
@@ -6438,112 +7117,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "评分"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "无"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "书籍 <font face=\"serif\">%s</font> 中 %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "双击<b>编辑</b>该项<br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "不允许"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6639,282 +7296,253 @@ msgstr "在控制台记录调试信息"
 msgid "Do not check for updates"
 msgstr "不检测更新"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr "为您的 calibre 电子书库选择位置"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr "创建书库失败"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr "在 %r 创建 calibre 书库失败。放弃。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr "修复失败"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr "修复数据库失败。开始新建空白数据库。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Calibre 书库"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr "为您的 calibre 电子书库选择位置"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr "创建书库失败"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr "为您的新 calibre 电子书库选择位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr "修复失败"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr "修复数据库失败。开始新建空白数据库。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "错误数据库位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr "错误数据库位置 %r。calibre 将退出。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr "数据库损坏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr "您的 calibre 数据库可能已经损坏。是否需要自动修复？若否，将新建空白书库。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr "正在修复数据库。若容量大则时间将非常长"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr "错误数据库位置 %r。将新建空白 calibre 书库"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "如果您确定它没有运行"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "无法开始 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s 正在运行。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "可能在系统栏中运行，在"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "屏幕右上区域。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "屏幕右下区域。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "尝试重启电脑。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "尝试删除文件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr "在 ui.py 中设定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "高级搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "搜索(&S)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr "<p>用标题、作者、出版商、标签、注释等搜索书籍列表<br><br>空格间隔关键词视为且(AND)关系"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "重置快速搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr "选择已存搜索或输入新存入搜索名称"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr "当前搜索文本（取代搜索名称）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr "以框中名称保存当前搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr "删除当前已存搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "按流行度排序(&P)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "匹配任一"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "匹配所有"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "添加书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "移除书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "编辑元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "发送到设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "保存到磁盘"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "抓取新闻"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "转换电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "查看"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "打开包含目录"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "显示书籍详情"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "同作者的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "同系列的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "同出版商的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "同标签的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "配置 Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -6944,15 +7572,35 @@ msgstr "书籍既没有标题也没有 ISBN 编号"
 msgid "No matches found for this book"
 msgstr "未找到匹配此书信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "搜索（点击左侧按钮进行高级搜索）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr "已存搜索"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr "（所有书籍）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "按任意键..."
@@ -7013,82 +7661,75 @@ msgstr "清除"
 msgid "&Alternate shortcut:"
 msgstr "其它快捷键(&A)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "任务："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "点击查看活动任务。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr "搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "匹配所有"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "匹配任一"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7130,603 +7771,85 @@ msgid ""
 "reconvert them?"
 msgstr "下列书籍已经被转换为 %s 格式。您希望转换它们么？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "将单格式存入磁盘"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "搜索（点击左侧按钮进行高级搜索）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr "已存搜索"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "与设备通信发生错误"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "恢复(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "捐款赞助 Calibre 项目(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr "弹出已连接设备(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "重启(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>帮助参见：<a href=\"%s\">用户手册</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "逐个修改元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "批量修改元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "下载元数据和封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "仅下载元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "仅下载封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "仅下载社会性元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr "合并到第一本选定书籍 - 删除其它"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr "合并到第一本选定书籍 - 保留其它"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "从单个目录添加书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr "从目录添加书籍，包含子目录（单个目录下有多本书籍，假定每一本电子书文件均为同一本书的不同格式）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr "从目录添加书籍，包含子目录（单个目录下有多本书籍，假定每一本电子书文件均为不同电子书）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "添加空书。（无任何格式）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "保存到磁盘单个目录"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "仅保存 %s 到磁盘"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "查看特定格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "移除选定书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "移除选定书籍中指定格式的书..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "移除所有格式选定书籍，除..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "移除选定书籍封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "分别转换"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "批量转换"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "在您 calibre 书库中创建书籍类目"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "运行欢迎向导"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "类似书籍..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速上手指南"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "用封面浏览"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr "（所有书籍）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "设备： "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " 被检测到。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "已连接 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "设备数据库损坏"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>您的阅读器书籍数据库已经损坏。尝试下列步骤：\n"
-"                <ol>\n"
-"                <li>拔下阅读器。等待重新生成数据库（如，等待它可以正常使用）。再次插入。则它可以和 %(app)s "
-"协作。如果不行，尝试下一个步骤。</li>\n"
-"                <li>退出 %(app)s。 找到阅读器主存储器中 media.xml "
-"文件。删除。拔下阅读器。等待它重新生成该文件。重新连接它之后开启 %(app)s。</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "仅使用书库"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "仅使用主书库生成注释"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "未选择书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr "未选定书籍抓取注释"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "将用户注释合并到数据库"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr "%s<br />最后已读页：%d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr "%s<br />最后已读页：位置 %d (%d%%)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr "<b>位置 %d &bull; %s</b><br />%s<br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr "<b>页数 %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr "<b>位置 %d &bull; %s</b><br />"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "多少空白书籍？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "应添加多少空白书籍？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "正在上传书籍到设备。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr "Topaz 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "文本书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF 书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "漫画"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "归档"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "支持的书j"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr "合并一些书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr "找到一些重复内容，并入如下已有书籍："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "无法读取元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "无法从下列项目读取元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "无法删除"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "未选择书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "选择删除格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "选择<b>非</b>删除格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr "选定书籍将被<b>永久删除</b>，文件会从您的电脑中移除。是否确定？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "从设备删除书籍。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "无法下载元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "社会性元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "正在为 %s 本书下载 %s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "下载一些元数据失败"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "下载下列书籍元数据失败："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "下载元数据失败。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "无法编辑元数据"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr "无法合并书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr "合并需要选定至少两本书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr "您将要合并多余 5 本书。<b>是否</b>确定？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "无法保存到磁盘"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "选择目标目录"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "保存出错"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "保存时出错。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "无法保存一些书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "点击显示详情按钮查看具体哪些。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "未选定书籍生成类目"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "正在生成 %s 类目..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"没有书籍收入类目\n"
-"检查不含标签"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "已经生成类目。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "输出类目目录"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "选定目标位置 %s.%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "正在抓取新闻，来源于 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " 已抓取。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "无法转换"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "开始转换 %d 本书"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "无法查看"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "选定多本书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr "您正在试图打开 %d 本书籍。同时打开太多书籍可能会变慢，并对电脑响应速度有消极影响。一旦开始，需等待进程完成。是否继续？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "无法打开文件夹"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s 无可用格式。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "无法配置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "有正在运行任务时无法进行配置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "无可用详细信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "设备上书籍没有详细信息可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "设备通讯错误。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr "与设备通讯出现临时性错误。请拔下再重新连接设备，或可能需要重启。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "转换错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr "<p>无法转换：%s<p> 它是 <a href=\"%s\">DRM</a> 保护书籍。您需要首先使用第三方工具去除 DRM。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr "清单禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>失败</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr "是众多全球志愿者的努力结晶。如果您觉得它有用，请考虑捐助支持开发。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "仍有任务运行。您是否希望退出？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7736,28 +7859,28 @@ msgstr ""
 "                      退出可能导致设备损坏。<br>\n"
 "                      确定退出么？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "警告：正在运行任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr "将在系统栏中继续运行。要关闭，在系统栏菜单中选择<b>退出</b>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 "<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "有可用更新"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8229,15 +8352,15 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "打印电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "复制图像"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "粘贴图像"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8247,7 +8370,7 @@ msgstr ""
 "%d\n"
 "本书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8257,7 +8380,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8267,7 +8390,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8277,46 +8400,58 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "点击查看电脑上可用书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr "点击查看阅读区主存储中的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr "点击查看阅读器存储卡 A 中的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr "点击查看阅读器存储卡 B 中的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "大小写转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "大写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "小写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "转换大小写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr "标题大写"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8588,48 +8723,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "打开内容服务器(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -9053,7 +9188,7 @@ msgid ""
 msgstr "为搜索查询过滤结果。搜索查询格式请参见用户手册中搜索相关内容。默认：不过滤"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "显示详细输出信息。有利调试"
 
@@ -9142,43 +9277,47 @@ msgstr ""
 "\n"
 "具体命令帮助：%%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>正在将旧数据库转移到位于 %s 的新数据库<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "正在复制<b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "正在压缩数据库"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "正在检查"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "正在检查缺失文件。"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "已检查 id"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9368,43 +9507,43 @@ msgstr "内容服务器上书库目录路径"
 msgid "Write process PID to the specified file"
 msgstr "指定文件写进程 PID"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9547,34 +9686,38 @@ msgid "English (Pakistan)"
 msgstr "英语（巴基斯坦）"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "英语（新加坡）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "英语（也门）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr "英语（冰岛）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr "西班牙语（巴拉圭）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "德语（奥地利）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "荷兰语（荷兰）"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "荷兰语（比利时）"
 
@@ -9631,97 +9774,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr "不从 calire 服务器下载最新订阅清单"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "未知新闻来源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "订阅清单“%s”需要用户名与密码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "下载完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "下载下列文章失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr "下载下列文章的某些部分失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr " 自 "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\t失败链接："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "无法抓取文章。使用 -vv 选项运行察看原因。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "正在抓取源..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "从索引页面获取了源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "正在尝试下载封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr "正在生成刊头..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr "开始下载 [ %d 线程数]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "新闻源下载到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "无法下载封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "正在从 %s 下载封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr "已下载刊头图像"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "无标题文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "已下载文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "下载失败文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "抓取源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr "登录失败，检查您 calibre 期刊服务的用户名密码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9742,7 +9885,7 @@ msgstr "已计划"
 msgid "Custom"
 msgstr "自定义"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9752,48 +9895,48 @@ msgstr ""
 "\n"
 "URL 举例为 http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "URL 存储基目录。默认 %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "的带服务器响应的超时秒数。默认：%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr "递归级别最大值。如链接跟踪深度。默认：%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr "文件下载最大值。仅对来自于 <a href> 标签的文件有效。默认为 %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "连续抓取最小间隔秒数。默认为 %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr "您下载内容来源网站的字符编码。默认是试图猜测编码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr "匹配此正则表达式的链接都会被跟进。此选项可被多次使用，此时只要任一正则表达式有匹配链接，都被跟进。默认情况，所有链接都被跟进。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9804,19 +9947,28 @@ msgstr ""
 "任何匹配此正则表达式的链接都会被忽略。此选项可被多次使用，此时只要任一正则表达式有匹配链接，链接都被忽略。默认情况下，没有链接被忽略。如果 --"
 "filter-regexp 和 --match-regexp 均被使用，则优先应用 --filter-regexp。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "不下载 CSS 样式表。"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "按欢迎度排序标签"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "将unicode字符转换为ASCII字符."
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "按流行度排序(&P)"
+
 #~ msgid "Send specific format to storage card A"
 #~ msgstr "发送指定格式到存储卡 A"
 
 #~ msgid "Send specific format to storage card B"
 #~ msgstr "发送指定格式到存储卡 B"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "设备数据库损坏"
+
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "点击关闭封面浏览"
 
@@ -9836,6 +9988,30 @@ msgstr "不下载 CSS 样式表。"
 #~ "text."
 #~ msgstr "输出数据格式。可用选择：%s。默认纯文本。"
 
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>您的阅读器书籍数据库已经损坏。尝试下列步骤：\n"
+#~ "                <ol>\n"
+#~ "                <li>拔下阅读器。等待重新生成数据库（如，等待它可以正常使用）。再次插入。则它可以和 %(app)s "
+#~ "协作。如果不行，尝试下一个步骤。</li>\n"
+#~ "                <li>退出 %(app)s。 找到阅读器主存储器中 media.xml "
+#~ "文件。删除。拔下阅读器。等待它重新生成该文件。重新连接它之后开启 %(app)s。</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
 #~ msgid "and delete from library"
 #~ msgstr "并从书库中删除"
 
@@ -9858,6 +10034,9 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Editing meta information for %d books"
 #~ msgstr "为 %d 部书籍编辑元信息"
 
+#~ msgid "Failed to create calibre library at: %r. Aborting."
+#~ msgstr "在 %r 创建 calibre 书库失败。放弃。"
+
 #~ msgid "Merge books"
 #~ msgstr "合并书籍"
 
diff --git a/src/calibre/translations/zh_TW.po b/src/calibre/translations/zh_TW.po
index de9eaccf66..7d902392d6 100644
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-06 21:03+0000\n"
-"PO-Revision-Date: 2010-06-06 16:48+0000\n"
+"POT-Creation-Date: 2010-06-18 17:57+0000\n"
+"PO-Revision-Date: 2010-06-18 17:01+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
@@ -24,12 +24,12 @@ msgstr "完全不做任何事"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:418
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:347
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:432
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -41,22 +41,22 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:270
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:943
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -102,44 +102,46 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:809
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:812
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:666
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:492
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:826
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:302
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:314
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:876
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1394
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1516
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:330
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:342
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:985
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1586
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1710
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -279,62 +281,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "這個設定檔適用於 SONY PRS 300 電子書。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "這個設定檔適用於 SONY PRS 900 電子書。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "這個配置文件適用於 Microsoft Reader。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:342
 msgid "This profile is intended for the Mobipocket books."
 msgstr "這個配置文件適用於 Mobipocket 書籍。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:355
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "這個配置文件適用於翰林 V3 和類似設備。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:367
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "這個配置文件適用於翰林 V5 和類似設備。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:375
 msgid "This profile is intended for the Cybook G3."
 msgstr "這個配置文件適用於 Cybook G3 設備。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:388
 msgid "This profile is intended for the Cybook Opus."
 msgstr "這個配置文件適用於 Cybook Opus 設備。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:399
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "這個設定檔適用於 Amazon Kindle電子書。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:434
 msgid "This profile is intended for the Irex Illiad."
 msgstr "這個設定檔適用於 Irex Illiad。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "這個設定檔適用於 IRex Digital Reader 1000 電子書。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:461
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:475
 msgid "This profile is intended for the B&N Nook."
 msgstr "這個設定檔適用於邦諾電子書"
 
@@ -358,21 +360,21 @@ msgstr ""
 msgid "This profile is intended for the Kobo Reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "這個設定檔適用於SONY 的PRS-300電子書"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "這個設定檔適用於JetBook出的5 英吋電子書"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:319
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr "這個設定檔適用SONY PRS 系列，如 500/505/700 型號等，使用橫向頁面，主要適用於漫畫。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:417
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "這個設定檔適用於Amazon Kindle DX"
 
@@ -392,15 +394,19 @@ msgstr "本地外掛程式自訂設置"
 msgid "Disabled plugins"
 msgstr "已關閉的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+msgid "Enabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
 msgid "No valid plugin found in "
 msgstr "沒有在 中找到合適的外掛程式 "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
 msgid ""
 "    %prog options\n"
 "\n"
@@ -412,29 +418,29 @@ msgstr ""
 "    以載入的外部外掛程式自訂 calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "指定含有外掛程式的 zip 檔案的路徑來加入一個外掛程式。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "依名稱移除一個自訂的外掛程式。對內建外掛程式無效"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "自訂外掛程式。指定外掛程式的名稱以及用逗號分隔的自訂字串。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
 msgid "List all installed plugins"
 msgstr "列出所有已安裝的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Enable the named plugin"
 msgstr "開啟已經命名的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Disable the named plugin"
 msgstr "關閉已經命名的外掛程式"
 
@@ -448,59 +454,70 @@ msgid ""
 "first one that exists will be used"
 msgstr "要將電子書傳送至裝置的目錄清單，以逗號分隔。會使用第一個存在的目錄"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:70
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:46
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:154
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:172
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:175
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:240
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:271
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:861
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1023
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:277
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1028
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:452
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "裝置驅動程式設定"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr "這個裝置能使用的格式清單（依序排列）"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:762
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "新聞"
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "與 Binatone Readme eBook 閱讀器連接。"
@@ -523,6 +540,10 @@ msgstr "與 Cybook Gen 3 / Opus eBook 閱讀器連接。"
 msgid "Communicate with the EB600 eBook reader."
 msgstr "與 EB600 eBook 閱讀器連接。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:207
+msgid "Communicate with the PocketBook 301 reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
@@ -535,6 +556,10 @@ msgstr ""
 msgid "Communicate with the ESlick eBook reader."
 msgstr "與 ESlick eBook reader 通訊。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
@@ -549,14 +574,20 @@ msgstr "裝置介面"
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "與翰林V3電子書通訊。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "與翰林V5電子書通訊。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
 msgstr "與 BOOX eBook 閱讀器連接。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+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/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "與 Hanvon N520 eBook 閱讀器連接。"
@@ -583,7 +614,7 @@ msgstr "與 IRex Iliad eBook 閱讀器連接。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
 msgid "John Schember"
 msgstr "John Schember"
 
@@ -603,15 +634,15 @@ msgstr "與 Iriver Story 閱讀器連接。"
 msgid "Communicate with the JetBook eBook reader."
 msgstr "與 JetBook eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr "與 Kindle eBook reader 通訊。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "與 Kindle 2 eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "與 Kindle DX eBook 閱讀器連接。"
 
@@ -655,13 +686,13 @@ msgstr "與 Sony PRS-500 eBook 閱讀器連接。"
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:143
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
 msgid "Unnamed"
 msgstr "未命名的"
@@ -682,61 +713,50 @@ msgstr ""
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:248
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "無法偵測到 %s 磁碟機。嘗試重新開機。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:428
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "無法偵測到 %s 掛載點。嘗試重新開機。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:493
 msgid "Unable to detect the %s disk drive."
 msgstr "無法偵測到 %s 磁碟機。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:586
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:598
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "無法偵測到 %s 磁碟機。您的核心可能使用了已廢棄的 SYSFS 版本。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:606
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "無法裝載主記憶器（錯誤代碼：%d）"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:745
 msgid "The reader has no storage card in this slot."
 msgstr "這個閱讀器的插槽中沒有記憶卡。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:747
 msgid "Selected slot: %s is not supported."
 msgstr "選取的插槽：%s 尚未支援。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:776
 msgid "There is insufficient free space in main memory"
 msgstr "主記憶體可用空間不足"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:780
 msgid "There is insufficient free space on the storage card"
 msgstr "記憶卡可用空間不足"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:152
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1276
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
-msgid "News"
-msgstr "新聞"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "裝置設定"
@@ -746,57 +766,61 @@ msgid "Place files in sub directories if the device supports them"
 msgstr "如果裝置有支援，將檔案放在子目錄中"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "從裝置上的檔案讀取元數據"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+msgid "Use author sort instead of author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:38
 msgid "Template to control how books are saved"
 msgstr "用來控制要如何儲存書籍的範本"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
 msgstr "額外自訂項目"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
 msgstr "與 eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "取得裝置資訊..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:59
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
 msgid "Getting list of books on device..."
 msgstr "從裝置中取得書籍列表"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
 msgid "Transferring books to device..."
 msgstr "正在傳送書籍到裝置中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:237
 msgid "Adding books to device metadata listing..."
 msgstr "將書籍加入裝置的元數據清單..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:243
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:261
 msgid "Removing books from device..."
 msgstr "正在從裝置中移除書籍..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:268
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
 msgid "Removing books from device metadata listing..."
 msgstr "將書籍從裝置的元數據清單移除..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:294
 msgid "Sending metadata to device..."
 msgstr "正在傳送元數據到裝置..."
 
@@ -1427,15 +1451,15 @@ msgstr "叢書索引和評等的數值必須為數字。忽略"
 msgid "Failed to parse date/time"
 msgstr "解析日期/時刻失敗"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
 msgstr "將輸入轉換為HTML格式..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
 msgstr "正在對電子書籍進行轉換..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
 msgstr "建立中"
 
@@ -1762,84 +1786,88 @@ msgstr ""
 msgid "Comic"
 msgstr "漫畫"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:381
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:866
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "書名"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:373
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:341
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:867
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:62
 msgid "Publisher"
 msgstr "出版社"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "製作人"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
 msgid "Comments"
 msgstr "評論"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:106
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1052
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "標簽"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:105
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 msgid "Language"
 msgstr "語言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:996
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1044
 msgid "Timestamp"
 msgstr "時間戳記"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:400
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:60
 msgid "Published"
 msgstr "發佈於"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402
 msgid "Rights"
 msgstr "所有權"
 
@@ -1847,7 +1875,7 @@ msgstr "所有權"
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1956,6 +1984,10 @@ msgstr "儲存封面到"
 msgid "No cover found"
 msgstr "找不到封面"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:41
+msgid "Downloads metadata from Douban.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "元數據下載"
@@ -1994,6 +2026,10 @@ msgstr "要使用 isbndb.com 您必須註冊一個 %s免費帳號%s 並在下面
 msgid "Downloads social metadata from amazon.com"
 msgstr "從 amazon.com 下載社交網路元數據"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:205
+msgid "Downloads series information from librarything.com"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
@@ -2063,7 +2099,7 @@ msgstr ""
 "\n"
 "從 LibraryThing.com 以 ISBN 辨識書籍並取封面\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1222
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "封面"
@@ -2371,6 +2407,8 @@ msgstr ""
 "取得關於這個 PDF 的資訊。\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "作者"
 
@@ -2604,8 +2642,8 @@ msgid "Use Roman numerals for series number"
 msgstr "在叢書編號中使用羅馬數字"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Sort tags list by popularity"
-msgstr "依熱門度排序標籤清單"
+msgid "Sort tags list by name, popularity, or rating"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
@@ -2681,23 +2719,418 @@ msgstr ""
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "已複製"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy"
 msgstr "複製"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
 msgid "Copy to Clipboard"
 msgstr "複製到剪貼簿"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:397
 msgid "Choose Files"
 msgstr "選擇檔案"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:242
+msgid "Use library only"
+msgstr "只使用書庫"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:243
+msgid "User annotations generated from main library only"
+msgstr "使用者註記只從主要書庫產生"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:666
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1037
+msgid "No books selected"
+msgstr "尚未選取書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:74
+msgid "No books selected to fetch annotations from"
+msgstr "沒有選取書籍以取回註記"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:99
+msgid "Merging user annotations into database"
+msgstr "將使用者註記合併到資料庫"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:127
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:133
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:152
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:161
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:166
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:288
+msgid "How many empty books?"
+msgstr "有多少空白書籍？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:289
+msgid "How many empty books should be added?"
+msgstr "有多少空白書籍要加入？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:388
+msgid "Uploading books to device."
+msgstr "正在上傳書籍到裝置。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "Books"
+msgstr "書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:349
+msgid "EPUB Books"
+msgstr "EPUB 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+msgid "LRF Books"
+msgstr "LRF 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "HTML Books"
+msgstr "HTML 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LIT Books"
+msgstr "LIT 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "MOBI Books"
+msgstr "MOBI 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "Topaz books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "Text books"
+msgstr "純文字書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "PDF Books"
+msgstr "PDF 書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Comics"
+msgstr "漫畫"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "Archives"
+msgstr "壓縮檔"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:362
+msgid "Supported books"
+msgstr "支援的書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:397
+msgid "Merged some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:398
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:407
+msgid "Failed to read metadata"
+msgstr "無法讀取元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:408
+msgid "Failed to read metadata from the following"
+msgstr "無法從以下項目讀取元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "Add to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1214
+msgid "No book selected"
+msgstr "尚未選取書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:432
+msgid "No book files found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:454
+msgid "Cannot delete"
+msgstr "無法刪除"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:467
+msgid "Choose formats to be deleted"
+msgstr "選擇要刪除的格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:485
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "選擇<b>不要</b>刪除的格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:505
+msgid "Cannot delete books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:506
+msgid "No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:516
+msgid "Main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:427
+msgid "Storage Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:429
+msgid "Storage Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:523
+msgid "No books to delete"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:524
+msgid "None of the selected books are on the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:598
+msgid "Deleting books from device."
+msgstr "正在從裝置中刪除書籍。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:562
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr "選取的書籍會被<b>永久刪除</b>而檔案會從您的電腦中移除。您確定嗎？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:583
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:608
+msgid "Cannot download metadata"
+msgstr "不能下載元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:624
+msgid "social metadata"
+msgstr "社交網路元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "covers"
+msgstr "封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "metadata"
+msgstr "元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "Downloading %s for %d book(s)"
+msgstr "正在下載 %s，用於 %d 書"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:650
+msgid "Failed to download some metadata"
+msgstr "下載部分元數據失敗"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:651
+msgid "Failed to download metadata for the following:"
+msgstr "以下項目下載元數據失敗："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download metadata:"
+msgstr "下載元數據失敗："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:946
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "錯誤"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:703
+msgid "Cannot edit metadata"
+msgstr "不能編輯元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:722
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:725
+msgid "Cannot merge books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:726
+msgid "At least two books must be selected for merging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:741
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:753
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:853
+msgid "Cannot save to disk"
+msgstr "不能儲存到磁碟"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:856
+msgid "Choose destination directory"
+msgstr "選擇目的端目錄"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:889
+msgid "Error while saving"
+msgstr "當儲存時發生錯誤"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:890
+msgid "There was an error while saving."
+msgstr "當儲存時發生錯誤。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:898
+msgid "Could not save some books"
+msgstr "不能儲存某些書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:899
+msgid "Click the show details button to see which ones."
+msgstr "點選顯示詳細資料按鈕"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "No books selected to generate catalog for"
+msgstr "沒有選取書籍來建立分類"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:937
+msgid "Generating %s catalog..."
+msgstr "正在產生 %s 分類.."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
+msgid "No books found"
+msgstr "找不到書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"沒有可分類的書籍\n"
+"請檢查排除的標籤"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:953
+msgid "Catalog generated."
+msgstr "分類已產生。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:956
+msgid "Export Catalog Directory"
+msgstr "匯出分類目錄"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:957
+msgid "Select destination for %s.%s"
+msgstr "選擇 %s 的目的端。%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:973
+msgid "Fetching news from "
+msgstr "取回新聞於 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:987
+msgid " fetched."
+msgstr " 已取回。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1036
+msgid "Cannot convert"
+msgstr "不能轉換"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1065
+msgid "Starting conversion of %d book(s)"
+msgstr "正在開始 %d 本書的轉換"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1250
+msgid "Cannot view"
+msgstr "不能檢視"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "選擇要檢視的格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+msgid "Multiple Books Selected"
+msgstr "已選取多個書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
+msgid ""
+"You are attempting to open %d books. Opening too many books at once can be "
+"slow and have a negative effect on the responsiveness of your computer. Once "
+"started the process cannot be stopped until complete. Do you wish to "
+"continue?"
+msgstr "您正嘗試開啟 %d 本書。同時開啟太多書可能會很慢並且對您的電腦的回應有負面效果。當這個程序開始後直到完成之前都不能停止。您想要繼續嗎？"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1213
+msgid "Cannot open folder"
+msgstr "不能開啟資料夾"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1251
+msgid "%s has no available formats."
+msgstr "%s 沒有可用的格式。"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "搜尋"
@@ -2719,15 +3152,10 @@ msgid "The specified directory could not be processed."
 msgstr "指定的目錄無法處理。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:809
 msgid "No books"
 msgstr "沒有書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1938
-msgid "No books found"
-msgstr "找不到書籍"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "已加入"
@@ -2846,17 +3274,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
@@ -2875,17 +3303,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2907,6 +3335,58 @@ msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1042
+msgid "Path"
+msgstr "路徑"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1045
+msgid "Collections"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:55
+msgid "Click to open"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+msgid "None"
+msgstr "沒有"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+msgid "Click to open Book Details window"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML 選項"
@@ -2966,7 +3446,7 @@ msgstr "輸出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
@@ -2984,8 +3464,8 @@ msgstr "電子書選項"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1257
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1451
 msgid "Catalog"
 msgstr "分類"
 
@@ -3672,11 +4152,6 @@ msgstr ""
 msgid "RB Output"
 msgstr "RB 輸出"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2183
-msgid "Choose the format to view"
-msgstr "選擇要檢視的格式"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
@@ -3759,12 +4234,12 @@ msgid "Footer regular expression:"
 msgstr "頁尾正規表示式："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
 msgid "Invalid regular expression"
 msgstr "不正確的正規表示式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
 msgid "Invalid regular expression: %s"
 msgstr "不正確的正規表示式：%s"
 
@@ -3978,11 +4453,19 @@ msgstr ""
 "則會比對任何標籤。</p><p>要學習更多關於 XPath 的進階用法，請查閱 <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>。"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+msgid "Cover browser could not be loaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+msgid "Browse by covers"
+msgstr "依封面瀏覽"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4003,279 +4486,291 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:357
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:383
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "沒有可用的詳細資料。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Device no longer connected."
 msgstr "裝置已無連線。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:250
 msgid "Get device information"
 msgstr "取得裝置資訊"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:276
 msgid "Get list of books on device"
 msgstr "取得裝置上的書籍清單"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:286
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:295
 msgid "Send metadata to device"
 msgstr "傳送元數據到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304
 msgid "Upload %d books to device"
 msgstr "上傳 %d 本書到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
 msgid "Delete books from device"
 msgstr "從裝置刪除書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
 msgid "Download books from device"
 msgstr "從裝置下載書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
 msgid "View book on device"
 msgstr "檢視裝置上的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:381
 msgid "Set default send to device action"
 msgstr "設定預設的傳送到裝置動作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
 msgid "Email to"
 msgstr "寄電子郵件到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:398
+msgid " and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
 msgid "Send to main memory"
 msgstr "傳送到主記憶體"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:409
 msgid "Send to storage card A"
 msgstr "傳送到記憶卡 A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:411
 msgid "Send to storage card B"
 msgstr "傳送到記憶卡 B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
-msgid "Storage Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
-msgid "Storage Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
 msgid "Disconnect from folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
 msgid "Fetch annotations (experimental)"
 msgstr "取回註記（實驗性功能）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+msgid "Error communicating with device"
+msgstr "與裝置連線時發生錯誤"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:675
+msgid "Error talking to device"
+msgstr "與裝置連繫時發生錯誤"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr "與裝置連繫時發生暫時性錯誤。請拔除裝置後重新連線或重新開機。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:717
+msgid "Device: "
+msgstr "裝置： "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
+msgid " detected."
+msgstr " 被偵測到。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
+msgid "Connected "
+msgstr "已連線 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
 msgid "selected to send"
 msgstr "選擇要傳送的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:815
 msgid "Choose format to send to device"
 msgstr "選擇要傳送到裝置的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:823
 msgid "No device"
 msgstr "沒有裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824
 msgid "Cannot send: No device is connected"
 msgstr "不能傳送：沒有連線中的裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831
 msgid "No card"
 msgstr "沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:832
 msgid "Cannot send: Device has no storage card"
 msgstr "不能傳送：裝置沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "E-book:"
 msgstr "電子書："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876
 msgid "Attached, you will find the e-book"
 msgstr "已附加，您會發現電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
 msgid "in the %s format."
 msgstr "%s 格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:891
 msgid "Sending email to"
 msgstr "傳送電子郵件到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:719
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:990
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:921
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1020
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207
 msgid "No suitable formats"
 msgstr "沒有合適的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Auto convert the following books before sending via email?"
 msgstr "是否在透過電子郵件傳送前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:929
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "無法透過電子郵件傳送前下列書籍，因為找不到適合的格式："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:947
 msgid "Failed to email books"
 msgstr "無法寄出書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:948
 msgid "Failed to email the following books:"
 msgstr "無法寄出下列書籍："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
 msgid "Sent by email:"
 msgstr "以電子郵件傳送："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "News:"
 msgstr "新聞："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 msgid "Sent news to"
 msgstr "傳送新聞到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "是否在上傳到裝置前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050
 msgid "Sending catalogs to device."
 msgstr "正在傳送分類到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113
 msgid "Sending news to device."
 msgstr "正在傳送新聞到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 msgid "Sending books to device."
 msgstr "正在傳送書籍到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1208
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr "無法上傳下列書籍到裝置，因為找不到適合的格式。請先將書籍轉換為您的裝置支援的格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1256
 msgid "No space on device"
 msgstr "裝置上已無空間"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1257
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>不能上傳書籍到裝置，因為已無更多可用空間 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
 msgstr "選擇這個裝置可用的格式和它們的順序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
 msgstr "使用子目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
 msgstr "儲存範本(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:102
-msgid "Path"
-msgstr "路徑"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:103
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
-msgid "Formats"
-msgstr "格式"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "封面符合檢視(&C)"
@@ -4424,165 +4919,165 @@ msgstr "如果核取這個選項，已下載的新聞就會自動寄到這個<br
 msgid "new email address"
 msgstr "新電子郵件位址"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
+msgid "Wide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Narrow"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:500
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:501
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1650
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr "錯誤"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "Failed to install command line tools."
 msgstr "安裝命令列工具失敗。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Command line tools installed"
 msgstr "命令列工具已安裝"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
 msgid "Command line tools installed in"
 msgstr "命令列工具已安裝於"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移動 calibre.app，您必須重新安裝命令列工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:577
 msgid "No valid plugin path"
 msgstr "沒有有效的外掛程式路徑"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:578
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是有效的外掛程式路徑"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "Choose plugin"
 msgstr "選擇外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin cannot be disabled"
 msgstr "外掛程式不能停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
 msgid "The plugin: %s cannot be disabled"
 msgstr "外掛程式：%s 不能停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:603
 msgid "Plugin not customizable"
 msgstr "外掛程式不可自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:604
 msgid "Plugin: %s does not need customization"
 msgstr "外掛程式：%s 不需要自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:612
 msgid "Customize"
 msgstr "自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:650
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除內建的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:651
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 不能移除。它是內建的外掛程式。請嘗試停用它來代替。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:672
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:687
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "您確定嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:756
 msgid "Error log:"
 msgstr "錯誤紀錄檔："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:763
 msgid "Access log:"
 msgstr "存取紀錄檔："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:781
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:343
 msgid "Failed to start content server"
 msgstr "啟動內容伺服器失敗"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:805
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:815
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "選擇書籍的位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:822
 msgid "Invalid size"
 msgstr "不正確的大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:823
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸 %s 是無效的。格式必須為 寬度x高度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
 msgid "Invalid database location"
 msgstr "無效的資料庫位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:882
 msgid "Invalid database location "
 msgstr "無效的資料庫位置 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:883
 msgid "<br>Must be a directory."
 msgstr "<br>必須是目錄。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "無效的資料庫位置。<br>不能寫入 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:893
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
 msgid "Checking database integrity"
 msgstr "正在檢查資料庫完整性"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:947
 msgid "Failed to check database integrity"
 msgstr "檢查資料庫完整性失敗"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:939
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Some inconsistencies found"
 msgstr "發現某些不一致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:940
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:953
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -4696,204 +5191,213 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "傳送到裝置(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "電子書位置（電子書儲存在資料夾中以作者排序，而元數據則儲存在 metadata.db 檔案中）(&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "Browse for the new database location"
 msgstr "瀏覽新的資料庫位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Show notification when &new version is available"
 msgstr "當有新版本可用時顯示通知(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "預設下載社交網路元數據 (標籤/評等/其他)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "當取得元數據時覆蓋作者和書名(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Default network &timeout:"
 msgstr "預設網路逾時時間(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr "設定網路抓取的預設逾時時間（例如任何我們透過網路取得資訊的時間）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Choose &language (requires restart):"
 msgstr "選擇語言（需重新啟動）(&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Normal"
 msgstr "一般"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Job &priority:"
 msgstr "工作優先權(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Preferred &output format:"
 msgstr "偏好的輸出格式(&O):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Preferred &input format order:"
 msgstr "偏好的輸入格式(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Use &Roman numerals for series number"
 msgstr "在叢書編號使用羅馬數字(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Enable system &tray icon (needs restart)"
 msgstr "啟用系統匣圖示（需要重新啟動）(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Show &notifications in system tray"
 msgstr "在系統匣中顯示通知(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在個別視窗中顯示封面瀏覽器（需要重新啟動）(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+msgid "Show &average ratings in the tags browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Search as you type"
 msgstr "隨打即查"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自動將下載的新聞傳送到電子書閱讀器(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "當新聞自動傳送到閱讀器後將它自書庫刪除(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "在瀏覽模式中要顯示的封面數（需重新啟動）(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Toolbar"
 msgstr "工具列"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Button size in toolbar"
 msgstr "工具列按鈕大小(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "Show &text in toolbar buttons"
 msgstr "在工具列按鈕中顯示文字(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Select visible &columns in library view"
 msgstr "選擇在書庫檢視中顯示的欄位(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "Use internal &viewer for:"
 msgstr "使用內部檢視器於(&V):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "User Interface &layout (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Add an email address to which to send books"
 msgstr "加入要傳送電子書的電子郵件位址"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "&Add email"
 msgstr "加入電子郵件(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
 msgid "Make &default"
 msgstr "成為預設值(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
 msgid "&Remove email"
 msgstr "移除電子郵件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr "calibre 可以將書籍透過電子郵件傳送給您（或您的閱讀器）。已下載的新聞會自動傳送到所有有核取「自動傳送」的電子郵件位址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待 worker 程序的最大數目（需重新啟動）(&M)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Check database integrity"
 msgstr "檢查資料庫完整性(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Install command line tools"
 msgstr "安裝命令列工具(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Open calibre &configuration directory"
 msgstr "開啟 &calibre 組態目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "限制最大同時工作不超過可用的 &CPU 核心"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "Debug &device detection"
 msgstr "裝置偵測除錯(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -4901,75 +5405,75 @@ msgid ""
 msgstr ""
 "calibre 包含了一個網路伺服器，讓您可以在世界的任何地方使用瀏覽器存取您的書籍收藏。任何對這個設定值的改變都要在伺服器重新啟動後才會生效。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "Server &port:"
 msgstr "伺服器連接埠(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "使用者名稱(&U):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "密碼(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr "如果您讓密碼留空，任何人都可以使用網頁介面存取您的藏書。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "顯示封面的最大尺寸 (寬度x高度)。太大的封面會被調整大小。 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Max. &cover size:"
 msgstr "最大封面尺寸(&C):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "顯示密碼(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Max. &OPDS items per query:"
 msgstr "每次查詢最大 &OPDS 項目："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "&Start Server"
 msgstr "啟動伺服器(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 msgid "St&op Server"
 msgstr "停止伺服器(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 msgid "&Test Server"
 msgstr "測試伺服器(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid "Run server &automatically on startup"
 msgstr "啟動時自動執行伺服器(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid "View &server logs"
 msgstr "檢視伺服器紀錄檔(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4983,33 +5487,33 @@ msgstr ""
 "<p>Stanza 應該能自動看到您的 calibre 藏書。如果沒有，請試著在您 iPhone 上的 Stanza 閱讀器把 URL "
 "http://myhostname:8080 加入為新的分類。其中 myhostname 應該是執行 calibre 的電腦的有效主機名稱或 IP 位址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "您可以在這裡自訂 Caligre 的行為，控制它使用何種外掛程式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Enable/&Disable plugin"
 msgstr "啟用/停用外掛程式(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Customize plugin"
 msgstr "自訂外掛程式(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "&Remove plugin"
 msgstr "移除外掛程式(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "Add new plugin"
 msgstr "加入新的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Plugin &file:"
 msgstr "外掛程式檔案(&F):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 msgid "&Add"
 msgstr "加入(&A)"
 
@@ -5046,10 +5550,11 @@ msgid "Number"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:27
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:50
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:833
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:868
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "日期"
 
@@ -5065,68 +5570,69 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:30
 msgid "Floating point numbers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:32
 msgid "Integers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:34
 msgid "Ratings, shown with stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Yes/No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:62
 msgid "No column has been selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:66
 msgid "Selected column is not a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:97
 msgid "No lookup name was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:99
 msgid ""
-"The label must contain only letters and digits, and start with a letter"
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:108
 msgid "No column heading was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:114
 msgid "The lookup name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:124
 msgid "The heading %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:126
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
@@ -5237,6 +5743,27 @@ msgstr "再次顯示這個警告(&S)"
 msgid "ERROR"
 msgstr "錯誤"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+msgid "Location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1041
+msgid "Format"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "作者排序"
@@ -5445,11 +5972,6 @@ msgstr "不是有效的圖片"
 msgid "Choose formats for "
 msgstr "選擇格式給 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
-msgid "Books"
-msgstr "書籍"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "沒有權限"
@@ -5488,67 +6010,75 @@ msgstr "%s 格式中的封面是無效的"
 msgid "Abort the editing of all remaining books"
 msgstr "放棄所有剩餘書籍的編輯"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is valid"
 msgstr "這個 ISBN 編號是有效的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 msgid "This ISBN number is invalid"
 msgstr "這個 ISBN 編號是無效的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532
+msgid "Cannot use tag editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:533
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:553
 msgid "Downloading cover..."
 msgstr "正在下載封面..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:558
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:563
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Cannot fetch cover"
 msgstr "不能取回封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>無法取回封面。</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:567
 msgid "The download timed out."
 msgstr "下載已逾時。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "找不到這本書的封面。請先試著指定 ISBN。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:583
 msgid "Bad cover"
 msgstr "錯誤的封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:584
 msgid "The cover is not a valid picture"
 msgstr "這個封面不是有效的圖片"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:617
 msgid "There were errors"
 msgstr "有某些錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:618
 msgid "There were errors downloading social metadata"
 msgstr "下載社交網路元數據時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:647
 msgid "Cannot fetch metadata"
 msgstr "不能取回元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:648
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "您必須至少指定 ISBN、書名、作者或出版者"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:719
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:720
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "無法開啟 %s。它是否已被其他的程式開啟？"
 
@@ -5907,12 +6437,12 @@ msgid "Choose formats"
 msgstr "選擇格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
 msgid "Authors"
 msgstr "作者"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
 msgstr "出版商"
 
@@ -6025,12 +6555,12 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr "將標籤加入可用的標籤並套用到目前的書籍"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:500
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -6062,25 +6592,25 @@ msgstr ""
 msgid "Are you certain you want to delete the following items?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
 msgstr ""
 
@@ -6340,11 +6870,11 @@ msgstr "正規表示式 (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
 msgid "No match"
 msgstr "沒有相符"
 
@@ -6380,54 +6910,203 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "正規表示式 (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "儲存單一格式到磁碟..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+msgid "Edit metadata individually"
+msgstr "個別編輯元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+msgid "Edit metadata in bulk"
+msgstr "大量編輯元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+msgid "Download metadata and covers"
+msgstr "下載元數據和封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:60
+msgid "Download only metadata"
+msgstr "只下載元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only covers"
+msgstr "只下載封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
+msgid "Download only social metadata"
+msgstr "只下載社交網路元數據"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:71
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:82
+msgid "Add books from a single directory"
+msgstr "從單一目錄加入書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr "從目錄加入書籍，包含子目錄（每個目錄一本書，每個電子書檔案被當成同樣書籍的不同格式）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:88
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr "從目錄加入書籍，包含子目錄（每個目錄多本書，每個電子書檔案被當成不同的書籍）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:91
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "加入空的電子書（沒有格式的書籍）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+msgid "Save to disk"
+msgstr "儲存至磁碟"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+msgid "Save to disk in a single directory"
+msgstr "儲存到磁碟的單一目錄"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+msgid "Save only %s format to disk"
+msgstr "只儲存 %s 格式到磁碟"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+msgid "View"
+msgstr "檢視"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
+msgid "View specific format"
+msgstr "檢視指定的格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:125
+msgid "Remove selected books"
+msgstr "移除選取的書籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove files of a specific format from selected books.."
+msgstr "從選取書籍中移除指定格式的檔案.."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:130
+msgid "Remove all formats from selected books, except..."
+msgstr "從選取書籍移除所有的格式，除了..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:133
+msgid "Remove covers from selected books"
+msgstr "移除選取的書籍中的封面"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:136
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:153
+msgid "Convert individually"
+msgstr "個別轉換"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Bulk convert"
+msgstr "大量轉換"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:159
+msgid "Create catalog of books in your calibre library"
+msgstr "在您的 calibre 書庫建立書籍的分類"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
+msgid "Run welcome wizard"
+msgstr "執行歡迎精靈"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:199
+msgid "Similar books..."
+msgstr "類似的書籍..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:230
+msgid "Add books to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:309
+msgid "Cover Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:327
+msgid "Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:384
+msgid "Book Details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
 msgstr "狀態"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
 msgstr "進度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
 msgstr "執行時間"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
 msgstr "還有 %d 個執行中的工作："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "不明的工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
 msgstr "還有 %d 個等候中的工作："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "不能中止工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "不能終止與裝置連線中的工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "工作已經在執行"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "無法使用"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "工作："
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "點選以查看使用中的工作清單。"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - 工作"
 
@@ -6439,112 +7118,90 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:56
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:58
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:61
 msgid "Rating"
 msgstr "評等"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:296
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
-msgid "None"
-msgstr "沒有"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:302
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "書籍 <font face=\"serif\">%s</font> / %s。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:639
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1071
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1128
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:398
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:865
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:834
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:869
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:835
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:997
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:104
-msgid "Collections"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
-msgid "Format"
-msgstr "格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "請雙擊以<b>編輯</b>我<br><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:509
 msgid "Not allowed"
 msgstr "不允許的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:510
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6640,282 +7297,253 @@ msgstr "將除錯資訊記錄到主控台"
 msgid "Do not check for updates"
 msgstr "不要檢查更新"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:132
-msgid "Initializing user interface..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
 msgstr "Calibre 書庫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:84
+msgid "Choose a location for your calibre e-book library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93
+msgid "Failed to create library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94
+msgid "Failed to create calibre library at: %r."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:151
+msgid "Initializing user interface..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:176
+msgid "Repairing failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid "The database repair failed. Starting with a new empty library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:224
 msgid "Bad database location"
 msgstr "錯誤的資料庫位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
 msgid "Starting %s: Loading books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "If you are sure it is not running"
 msgstr "如果您不確定它是否在執行中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "Cannot Start "
 msgstr "不能啟動 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284
 msgid "%s is already running."
 msgstr "%s 已經在執行中。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:287
 msgid "may be running in the system tray, in the"
 msgstr "可能在系統匣中執行，在"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "upper right region of the screen."
 msgstr "畫面的右上角區域。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "lower right region of the screen."
 msgstr "畫面的右下角區域。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
 msgid "try rebooting your computer."
 msgstr "嘗試重新啟動您的電腦。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308
 msgid "try deleting the file"
 msgstr "嘗試刪除檔案"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Advanced search"
 msgstr "進階搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
 msgid "&Search:"
 msgstr "搜尋(&S):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Reset Quick Search"
 msgstr "重設快速搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
-msgid "Sort by &popularity"
-msgstr "依熱門程度排序(&P)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
-msgid "Match any"
-msgstr "符合任何"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
-msgid "Match all"
-msgstr "符合全部"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
-msgid "Create, edit, and delete user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
-msgid "Manage &user categories"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Add books"
 msgstr "加入書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Remove books"
 msgstr "移除書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Edit meta information"
 msgstr "編輯元數據資訊"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "Send to device"
 msgstr "傳送到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
-msgid "Save to disk"
-msgstr "儲存至磁碟"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Fetch news"
 msgstr "取回新聞"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Convert E-books"
 msgstr "轉換電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "View"
-msgstr "檢視"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Open containing folder"
 msgstr "開啟包含的資料夾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Show book details"
 msgstr "顯示書籍詳細資料"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
 msgid "Books by same author"
 msgstr "同樣作者的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
 msgid "Books in this series"
 msgstr "在這套叢書中的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
 msgid "Books by this publisher"
 msgstr "這個出版社的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
 msgid "Books with the same tags"
 msgstr "同樣標籤的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
 msgid "Configure calibre"
 msgstr "設定 calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -6945,15 +7573,35 @@ msgstr "具有書名或 ISBN 的書籍"
 msgid "No matches found for this book"
 msgstr "找不到這本書的符合項"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:251
 msgid "Search"
 msgstr "搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:304
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "搜尋（要使用進階搜尋請按左邊的按鈕）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:379
+msgid "Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+msgid "(all books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "({0} of all)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "請按下按鍵..."
@@ -7014,82 +7662,75 @@ msgstr "清除"
 msgid "&Alternate shortcut:"
 msgstr "替代的捷徑鍵(&A):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
-msgid "Jobs:"
-msgstr "工作："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
-msgid "Click to see list of active jobs."
-msgstr "點選以查看使用中的工作清單。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Hide Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:190
+msgid "Rename '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
-msgid "Show Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:194
+msgid "Edit sort for '%s'"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Hide Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
-msgid "Show Tag Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Hide Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
-msgid "Show Cover Browser"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
-msgid "Side bar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:135
-msgid "Cover browser could not be loaded: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:142
-msgid "Rename"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:199
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:206
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:161
-msgid "Manage "
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:217
+msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:231
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:329
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:266
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
-msgid "The name %s is already used."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:510
+msgid "Duplicate search name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "The saved search name %s is already used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:726
+msgid "Sort by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:727
+msgid "Sort by average rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match all"
+msgstr "符合全部"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:733
+msgid "Match any"
+msgstr "符合任何"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:738
+msgid "Manage &user categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
@@ -7131,603 +7772,85 @@ msgid ""
 "reconvert them?"
 msgstr "下列書籍已經被轉換為 %s 格式。您希望重新轉換它們嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
-msgid "Save single format to disk..."
-msgstr "儲存單一格式到磁碟..."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr "搜尋（要使用進階搜尋請按左邊的按鈕）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
-msgid "Error communicating with device"
-msgstr "與裝置連線時發生錯誤"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "還原(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
 msgstr "捐款支援 calibre (&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
 msgid "&Restart"
 msgstr "重新啟動(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>需要協助請查閱：<a href=\"%s\">User Manual</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>： %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
-msgid "Edit metadata individually"
-msgstr "個別編輯元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
-msgid "Edit metadata in bulk"
-msgstr "大量編輯元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
-msgid "Download metadata and covers"
-msgstr "下載元數據和封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Download only metadata"
-msgstr "只下載元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
-msgid "Download only covers"
-msgstr "只下載封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
-msgid "Download only social metadata"
-msgstr "只下載社交網路元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
-msgid "Add books from a single directory"
-msgstr "從單一目錄加入書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:302
-msgid ""
-"Add books from directories, including sub-directories (One book per "
-"directory, assumes every ebook file is the same book in a different format)"
-msgstr "從目錄加入書籍，包含子目錄（每個目錄一本書，每個電子書檔案被當成同樣書籍的不同格式）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
-msgid ""
-"Add books from directories, including sub directories (Multiple books per "
-"directory, assumes every ebook file is a different book)"
-msgstr "從目錄加入書籍，包含子目錄（每個目錄多本書，每個電子書檔案被當成不同的書籍）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr "加入空的電子書（沒有格式的書籍）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
-msgid "Save to disk in a single directory"
-msgstr "儲存到磁碟的單一目錄"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2299
-msgid "Save only %s format to disk"
-msgstr "只儲存 %s 格式到磁碟"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2302
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
-msgid "View specific format"
-msgstr "檢視指定的格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-msgid "Remove selected books"
-msgstr "移除選取的書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
-msgid "Remove files of a specific format from selected books.."
-msgstr "從選取書籍中移除指定格式的檔案.."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
-msgid "Remove all formats from selected books, except..."
-msgstr "從選取書籍移除所有的格式，除了..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
-msgid "Remove covers from selected books"
-msgstr "移除選取的書籍中的封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
-msgid "Convert individually"
-msgstr "個別轉換"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
-msgid "Bulk convert"
-msgstr "大量轉換"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
-msgid "Create catalog of books in your calibre library"
-msgstr "在您的 calibre 書庫建立書籍的分類"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
-msgid "Run welcome wizard"
-msgstr "執行歡迎精靈"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
-msgid "Similar books..."
-msgstr "類似的書籍..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:240
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速使用指南"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689
-msgid "Select folder to open as device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:800
-msgid "Browse by covers"
-msgstr "依封面瀏覽"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:870
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:875
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:877
-msgid "({0} of all)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
-msgid "Device: "
-msgstr "裝置： "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1002
-msgid " detected."
-msgstr " 被偵測到。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1034
-msgid "Connected "
-msgstr "已連線 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1046
-msgid "Device database corrupted"
-msgstr "裝置資料庫已損毀"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1047
-msgid ""
-"\n"
-"                <p>The database of books on the reader is corrupted. Try the "
-"following:\n"
-"                <ol>\n"
-"                <li>Unplug the reader. Wait for it to finish regenerating "
-"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
-"it should work with %(app)s. If not try the next step.</li>\n"
-"                <li>Quit %(app)s. Find the file media.xml in the reader's "
-"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
-"file. Re-connect it and start %(app)s.</li>\n"
-"                </ol>\n"
-"                "
-msgstr ""
-"\n"
-"                <p>閱讀器上的書籍資料庫已損毀。請嘗試下列步驟：\n"
-"                <ol>\n"
-"                <li>拔除閱讀器。等待它完成資料庫的重建（例如，等到它能正常使用為止）。將閱讀器重新連接。現在它應該可以與 "
-"%(app)s 正常運作。如果不行，請試下個步驟。</li>\n"
-"                <li>結束 %(app)s。在閱讀器的主記憶體中找到 media.xml "
-"檔案。刪除它。拔除閱讀器。等待它重建檔案。重新連接閱讀器後啟動 %(app)s。</li>\n"
-"                </ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "Use library only"
-msgstr "只使用書庫"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "User annotations generated from main library only"
-msgstr "使用者註記只從主要書庫產生"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1661
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1699
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1720
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1850
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1915
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2033
-msgid "No books selected"
-msgstr "尚未選取書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1119
-msgid "No books selected to fetch annotations from"
-msgstr "沒有選取書籍以取回註記"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1144
-msgid "Merging user annotations into database"
-msgstr "將使用者註記合併到資料庫"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1172
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1178
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1206
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1211
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1331
-msgid "How many empty books?"
-msgstr "有多少空白書籍？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1332
-msgid "How many empty books should be added?"
-msgstr "有多少空白書籍要加入？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1380
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
-msgid "Uploading books to device."
-msgstr "正在上傳書籍到裝置。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
-msgid "EPUB Books"
-msgstr "EPUB 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1393
-msgid "LRF Books"
-msgstr "LRF 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
-msgid "HTML Books"
-msgstr "HTML 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "LIT Books"
-msgstr "LIT 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
-msgid "MOBI Books"
-msgstr "MOBI 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1397
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1398
-msgid "Text books"
-msgstr "純文字書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1399
-msgid "PDF Books"
-msgstr "PDF 書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1400
-msgid "Comics"
-msgstr "漫畫"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1401
-msgid "Archives"
-msgstr "壓縮檔"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
-msgid "Supported books"
-msgstr "支援的書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1440
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1450
-msgid "Failed to read metadata"
-msgstr "無法讀取元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1451
-msgid "Failed to read metadata from the following"
-msgstr "無法從以下項目讀取元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1471
-msgid "Cannot delete"
-msgstr "無法刪除"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1474
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2202
-msgid "No book selected"
-msgstr "尚未選取書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1484
-msgid "Choose formats to be deleted"
-msgstr "選擇要刪除的格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1502
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr "選擇<b>不要</b>刪除的格式"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1540
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr "選取的書籍會被<b>永久刪除</b>而檔案會從您的電腦中移除。您確定嗎？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
-msgid ""
-"The selected books will be <b>permanently deleted</b> from your device. Are "
-"you sure?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1572
-msgid "Deleting books from device."
-msgstr "正在從裝置中刪除書籍。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
-msgid "Cannot download metadata"
-msgstr "不能下載元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1619
-msgid "social metadata"
-msgstr "社交網路元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "covers"
-msgstr "封面"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1621
-msgid "metadata"
-msgstr "元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1623
-msgid "Downloading %s for %d book(s)"
-msgstr "正在下載 %s，用於 %d 書"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1645
-msgid "Failed to download some metadata"
-msgstr "下載部分元數據失敗"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1646
-msgid "Failed to download metadata for the following:"
-msgstr "以下項目下載元數據失敗："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1649
-msgid "Failed to download metadata:"
-msgstr "下載元數據失敗："
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1660
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1698
-msgid "Cannot edit metadata"
-msgstr "不能編輯元數據"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1719
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1722
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1723
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1727
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1738
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1750
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
-msgid "Cannot save to disk"
-msgstr "不能儲存到磁碟"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1852
-msgid "Choose destination directory"
-msgstr "選擇目的端目錄"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1885
-msgid "Error while saving"
-msgstr "當儲存時發生錯誤"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
-msgid "There was an error while saving."
-msgstr "當儲存時發生錯誤。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1894
-msgid "Could not save some books"
-msgstr "不能儲存某些書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1895
-msgid "Click the show details button to see which ones."
-msgstr "點選顯示詳細資料按鈕"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "No books selected to generate catalog for"
-msgstr "沒有選取書籍來建立分類"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1933
-msgid "Generating %s catalog..."
-msgstr "正在產生 %s 分類.."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1939
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-"沒有可分類的書籍\n"
-"請檢查排除的標籤"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1949
-msgid "Catalog generated."
-msgstr "分類已產生。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1952
-msgid "Export Catalog Directory"
-msgstr "匯出分類目錄"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1953
-msgid "Select destination for %s.%s"
-msgstr "選擇 %s 的目的端。%s"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1967
-msgid "Fetching news from "
-msgstr "取回新聞於 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1981
-msgid " fetched."
-msgstr " 已取回。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2032
-msgid "Cannot convert"
-msgstr "不能轉換"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-msgid "Starting conversion of %d book(s)"
-msgstr "正在開始 %d 本書的轉換"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2177
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2235
-msgid "Cannot view"
-msgstr "不能檢視"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2191
-msgid "Multiple Books Selected"
-msgstr "已選取多個書籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
-msgid ""
-"You are attempting to open %d books. Opening too many books at once can be "
-"slow and have a negative effect on the responsiveness of your computer. Once "
-"started the process cannot be stopped until complete. Do you wish to "
-"continue?"
-msgstr "您正嘗試開啟 %d 本書。同時開啟太多書可能會很慢並且對您的電腦的回應有負面效果。當這個程序開始後直到完成之前都不能停止。您想要繼續嗎？"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
-msgid "Cannot open folder"
-msgstr "不能開啟資料夾"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
-msgid "%s has no available formats."
-msgstr "%s 沒有可用的格式。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2277
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:392
 msgid "Cannot configure"
 msgstr "不能設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:388
 msgid "Cannot configure while there are running jobs."
 msgstr "當有工作仍在進行時不能設定。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2283
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:438
 msgid "No detailed info available"
 msgstr "沒有詳細資訊可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2335
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:439
 msgid "No detailed information is available for books on the device."
 msgstr "在這個裝置上的書籍沒有詳細資訊可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2385
-msgid "Failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2391
-msgid "Error talking to device"
-msgstr "與裝置連繫時發生錯誤"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2392
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr "與裝置連繫時發生暫時性錯誤。請拔除裝置後重新連線或重新開機。"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2415
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2443
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Conversion Error"
 msgstr "轉換時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2416
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:490
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr "<p>無法轉換：%s<p>它是具有 <a href=\"%s\">DRM</a> 的書籍。您必須先移除 DRM 後才能使用第三方工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2429
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:503
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2444
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518
 msgid "<b>Failed</b>"
 msgstr "<b>失敗</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:558
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr "是世界各地許多志工努力的成果。如果您覺得它有用，請考慮捐款以支持它的開發。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2516
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "還有使用中的工作。您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2519
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:586
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7737,28 +7860,28 @@ msgstr ""
 "                      現在結束可能造成裝置上的損毀。<br>\n"
 "                      您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2523
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:590
 msgid "WARNING: Active jobs"
 msgstr "警告：使用中的工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:642
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr "會在系統匣中保持執行。要關閉它，請在系統匣的關聯選單中選擇<b>結束</b>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2594
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 "<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2602
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
 msgid "Update available"
 msgstr "有更新可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2603
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8230,15 +8353,15 @@ msgstr ""
 msgid "Print eBook"
 msgstr "列印電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
 msgid "Paste Image"
 msgstr "貼上圖片"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Library\n"
 "%d\n"
@@ -8248,7 +8371,7 @@ msgstr ""
 "%d\n"
 "本書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Reader\n"
 "%s\n"
@@ -8258,7 +8381,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:230
 msgid ""
 "Card A\n"
 "%s\n"
@@ -8268,7 +8391,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:231
 msgid ""
 "Card B\n"
 "%s\n"
@@ -8278,46 +8401,58 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
 msgid "Click to see the books available on your computer"
 msgstr "按這裡查看您的電腦上有多少書籍可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books in the main memory of your reader"
 msgstr "按這裡查看您的閱讀器主記憶體中有多少書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Click to see the books on storage card A in your reader"
 msgstr "按這裡查看您的閱讀器記憶卡 A 中有多少書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
 msgid "Click to see the books on storage card B in your reader"
 msgstr "按這裡查看您的閱讀器記憶卡 B 中有多少書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:248
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Change Case"
 msgstr "變更大小寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Upper Case"
 msgstr "全大寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Lower Case"
 msgstr "全小寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:509
 msgid "Swap Case"
 msgstr "大小寫互換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:510
 msgid "Title Case"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:932
+msgid "Drag to resize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:963
+msgid "Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:968
+msgid "Hide"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
@@ -8592,48 +8727,48 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "開啟內容伺服器(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:270
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:275
 msgid "today"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:273
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:278
 msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:276
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:281
 msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:279
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:280
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:284
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:285
 msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "no"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:430
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:440
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:435
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:445
 msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:433
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:443
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:438
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:448
 msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "blank"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/caches.py:437
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:442
 msgid "empty"
 msgstr ""
 
@@ -9079,7 +9214,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
 msgstr "顯示詳細的輸出資訊。除錯時很有用"
 
@@ -9168,43 +9303,47 @@ msgstr ""
 "\n"
 "需要個別指令的說明： %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:487
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:520
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:489
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:522
 msgid "Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:491
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:524
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1542
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>將舊的資料庫轉移到 %s 的電子書庫<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1571
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1765
 msgid "Copying <b>%s</b>"
 msgstr "正在複製 <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1588
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1782
 msgid "Compacting database"
 msgstr "正在壓實資料庫"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1681
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1875
 msgid "Checking SQL integrity..."
 msgstr "正在檢查 SQL 完整性..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1720
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1916
 msgid "Checking for missing files."
 msgstr "正在檢查缺少的檔案。"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1742
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1938
 msgid "Checked id"
 msgstr "已檢查 id"
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
 msgstr ""
 
@@ -9397,43 +9536,43 @@ msgstr "用於內容伺服器的書庫資料夾路徑"
 msgid "Write process PID to the specified file"
 msgstr "將程序 PID 寫入指定的檔案"
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
 msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:535
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
 msgstr ""
 
@@ -9576,34 +9715,38 @@ msgid "English (Pakistan)"
 msgstr "英文 (巴基斯坦)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
+msgid "English (Israel)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
 msgstr "英文 (新加坡)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
 msgstr "英文 (葉門)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
 msgstr "德文 (AT)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
 msgstr "荷蘭文 (NL)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
 msgstr "荷蘭文 (BE)"
 
@@ -9660,97 +9803,97 @@ msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "未知的新聞來源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:606
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703
 msgid "Download finished"
 msgstr "下載完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:705
 msgid "Failed to download the following articles:"
 msgstr "無法下載下列文章："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:715
 msgid "\tFailed links:"
 msgstr "\t失敗的連結："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "無法取回文章。以 -vv 執行來查看原因。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:849
 msgid "Fetching feeds..."
 msgstr "正在取回餵送..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:854
 msgid "Got feeds from index page"
 msgstr "從索引頁取得餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:860
 msgid "Trying to download cover..."
 msgstr "正在嘗試下載封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:862
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Feeds downloaded to %s"
 msgstr "將餵送下載到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:969
 msgid "Could not download cover: %s"
 msgstr "無法下載封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
 msgid "Downloading cover from %s"
 msgstr "正在從 %s 下載封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1021
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1211
 msgid "Untitled Article"
 msgstr "無標題的文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1282
 msgid "Article downloaded: %s"
 msgstr "已下載的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1293
 msgid "Article download failed: %s"
 msgstr "下載失敗的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1310
 msgid "Fetching feed"
 msgstr "正在取回餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1457
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1473
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9771,7 +9914,7 @@ msgstr "已排程"
 msgid "Custom"
 msgstr "自訂"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9781,48 +9924,48 @@ msgstr ""
 "\n"
 "URL 例如 http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "儲存 URL 的基礎目錄。預設值為 %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "等候伺服器回應的預設逾時時間。預設值：%default 秒"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr "循環層數的最大值，即跟隨連結的深度。預設值為 %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr "要下載檔案的最大數量。這只套用到 <a href> 標籤的檔案。預設值為 %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "持續抓取的最小間隔秒數。預設值為 %default 秒"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr "您嘗試下載的網站的字元編碼。預設值為嘗試猜測其編碼。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr "只有符合這個正規表示式的連結才會跟隨。這個選項可以多次指定，只要有連結符合任何正規表示式，它就會被跟隨。預設值為所有連結都會被跟隨。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -9833,7 +9976,7 @@ msgstr ""
 "任何符合這個正規表示式的連結都會略過。這個選項可以多次指定，只要有連結符合任何正規表示式，它就會被略過。預設值為不略過任何連結。如果同時指定 --"
 "filter-regexp 和 --match-regexp，則會先套用 --filter-regexp。"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
 msgstr "不要下載 CSS 樣式表。"
 
@@ -9846,6 +9989,9 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "dummy option until real options are determined."
 #~ msgstr "在確實決定選項之前的暫時選項"
 
+#~ msgid "Sort tags list by popularity"
+#~ msgstr "依熱門度排序標籤清單"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "將統一碼字元轉譯為 ASCII (&T)。"
 
@@ -9885,6 +10031,36 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "選擇您的電子書庫的位置。"
 
+#~ msgid "Sort by &popularity"
+#~ msgstr "依熱門程度排序(&P)"
+
+#~ msgid ""
+#~ "\n"
+#~ "                <p>The database of books on the reader is corrupted. Try the "
+#~ "following:\n"
+#~ "                <ol>\n"
+#~ "                <li>Unplug the reader. Wait for it to finish regenerating "
+#~ "the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+#~ "it should work with %(app)s. If not try the next step.</li>\n"
+#~ "                <li>Quit %(app)s. Find the file media.xml in the reader's "
+#~ "main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+#~ "file. Re-connect it and start %(app)s.</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                <p>閱讀器上的書籍資料庫已損毀。請嘗試下列步驟：\n"
+#~ "                <ol>\n"
+#~ "                <li>拔除閱讀器。等待它完成資料庫的重建（例如，等到它能正常使用為止）。將閱讀器重新連接。現在它應該可以與 "
+#~ "%(app)s 正常運作。如果不行，請試下個步驟。</li>\n"
+#~ "                <li>結束 %(app)s。在閱讀器的主記憶體中找到 media.xml "
+#~ "檔案。刪除它。拔除閱讀器。等待它重建檔案。重新連接閱讀器後啟動 %(app)s。</li>\n"
+#~ "                </ol>\n"
+#~ "                "
+
+#~ msgid "Device database corrupted"
+#~ msgstr "裝置資料庫已損毀"
+
 #~ msgid "Invalid library location"
 #~ msgstr "無效的書庫位置"